diff --git a/client_logins.php b/client_logins.php
index 880ece33..38db0217 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -20,7 +20,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
   <div class="card card-dark">
     <div class="card-header py-2">
-      <h3 class="card-title mt-2"><i class="fa fa-fw fa-key"></i> Logins</h3>
+      <h3 class="card-title mt-2"><i class="fa fa-fw fa-key"></i> Passwords</h3>
       <div class="card-tools">
         <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLoginModal"><i class="fas fa-fw fa-plus"></i> New Login</button>
       </div>
@@ -33,7 +33,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
           <div class="col-md-4">
             <div class="input-group mb-3 mb-md-0">
-              <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search <?php echo ucwords(strip_tags($_GET['tab'])); ?>">
+              <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Passwords">
               <div class="input-group-append">
                 <button class="btn btn-dark"><i class="fa fa-search"></i></button>
               </div>
diff --git a/client_side_nav.php b/client_side_nav.php
index d5aa9ce9..8c5de39f 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -66,7 +66,7 @@
           <a href="?client_id=<?php echo $client_id; ?>&tab=software" class="nav-link <?php if($_GET['tab'] == "software") { echo "active"; } ?>">
             <i class="nav-icon fas fa-cube"></i>
             <p>
-              Software
+              Licenses
               <?php 
               if($num_software > 0){ ?>
               <span class="right badge badge-light"><?php echo $num_software; ?></span>
@@ -79,7 +79,7 @@
           <a href="?client_id=<?php echo $client_id; ?>&tab=logins" class="nav-link <?php if($_GET['tab'] == "logins") { echo "active"; } ?>">
             <i class="nav-icon fas fa-key"></i>
             <p>
-              Logins
+              Passwords
               <?php 
               if($num_logins > 0){ ?>
               <span class="right badge badge-light"><?php echo $num_logins; ?></span>
diff --git a/client_software.php b/client_software.php
index fc1606a4..d7241432 100644
--- a/client_software.php
+++ b/client_software.php
@@ -21,9 +21,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
 
 <div class="card card-dark">
   <div class="card-header py-2">
-    <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube"></i> Software</h3>
+    <h3 class="card-title mt-2"><i class="fa fa-fw fa-cube"></i> Licenses</h3>
     <div class="card-tools">
-      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareModal"><i class="fas fa-fw fa-plus"></i> New Software</button>
+      <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addSoftwareModal"><i class="fas fa-fw fa-plus"></i> New License</button>
     </div>
   </div>
   <div class="card-body">
@@ -34,7 +34,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
         
         <div class="col-md-4">
           <div class="input-group mb-3 mb-md-0">
-            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search <?php echo ucwords(strip_tags($_GET['tab'])); ?>">
+            <input type="search" class="form-control" name="q" value="<?php if(isset($q)){echo stripslashes($q);} ?>" placeholder="Search Licenses">
             <div class="input-group-append">
               <button class="btn btn-dark"><i class="fa fa-search"></i></button>
             </div>
diff --git a/client_software_add_modal.php b/client_software_add_modal.php
index b40a3826..d3f7b46c 100644
--- a/client_software_add_modal.php
+++ b/client_software_add_modal.php
@@ -2,7 +2,7 @@
   <div class="modal-dialog">
     <div class="modal-content bg-dark">
       <div class="modal-header">
-        <h5 class="modal-title"><i class="fa fa-fw fa-cube"></i> New Software</h5>
+        <h5 class="modal-title"><i class="fa fa-fw fa-cube"></i> New License</h5>
         <button type="button" class="close text-white" data-dismiss="modal">
           <span>&times;</span>
         </button>