diff --git a/client_download_pdf_modal.php b/client_download_pdf_modal.php
index 8c127a55..da046487 100644
--- a/client_download_pdf_modal.php
+++ b/client_download_pdf_modal.php
@@ -14,7 +14,6 @@
                         <div class="row">
                             <div class="col-sm-6">
                                 
-                    
                                 <li class="list-group-item">
                                     <div class="custom-control custom-checkbox">
                                         <input class="custom-control-input" type="checkbox" id="contacts" name="export_contacts" value="1" checked>
@@ -55,7 +54,7 @@
                                     <div class="custom-control custom-checkbox">
                                         <input class="custom-control-input" type="checkbox" id="logins" name="export_logins" value="1">
                                         <label for="logins" class="custom-control-label">
-                                            <i class='fas fa-fw fa-key mr-2'></i>Logins
+                                            <i class='fas fa-fw fa-key mr-2'></i>Credentials
                                         </label>
                                     </div>
                                 </li>
diff --git a/client_login_add_modal.php b/client_login_add_modal.php
index 40cc6d27..90af7d2e 100644
--- a/client_login_add_modal.php
+++ b/client_login_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-key mr-2"></i>New Login</h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>New Credential</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
@@ -65,12 +65,12 @@
                             </div>
 
                             <div class="form-group">
-                                <label>Password <strong class="text-danger">*</strong></label>
+                                <label>Password / Key <strong class="text-danger">*</strong></label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                                     </div>
-                                    <input type="password" class="form-control" data-toggle="password" id="password" name="password" placeholder="Password" required autocomplete="new-password">
+                                    <input type="password" class="form-control" data-toggle="password" id="password" name="password" placeholder="Password or Key" required autocomplete="new-password">
                                     <div class="input-group-append">
                                         <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                                     </div>
@@ -81,7 +81,7 @@
                             </div>
 
                             <div class="form-group">
-                                <label>OTP</label>
+                                <label>TOTP Seed</label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
diff --git a/client_login_edit_modal.php b/client_login_edit_modal.php
index 49e08bbc..b7400df6 100644
--- a/client_login_edit_modal.php
+++ b/client_login_edit_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-key mr-2"></i>Editing login: <strong><?php echo $login_name; ?></strong></h5>
+                <h5 class="modal-title"><i class="fa fa-fw fa-key mr-2"></i>Editing credential: <strong><?php echo $login_name; ?></strong></h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
@@ -66,12 +66,12 @@
                             </div>
 
                             <div class="form-group">
-                                <label>Password <strong class="text-danger">*</strong></label>
+                                <label>Password / Key <strong class="text-danger">*</strong></label>
                                 <div class="input-group">
                                     <div class="input-group-prepend">
                                         <span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
                                     </div>
-                                    <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password" value="<?php echo $login_password; ?>" required autocomplete="new-password">
+                                    <input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password or Key" value="<?php echo $login_password; ?>" required autocomplete="new-password">
                                     <div class="input-group-append">
                                         <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                                     </div>
diff --git a/client_login_export_modal.php b/client_login_export_modal.php
index 0ef7275a..e00581d5 100644
--- a/client_login_export_modal.php
+++ b/client_login_export_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="fas fa-fw fa-download mr-2"></i>Export Passwords to CSV</h5>
+                <h5 class="modal-title"><i class="fas fa-fw fa-download mr-2"></i>Export Credentials to CSV</h5>
                 <button type="button" class="close text-white" data-dismiss="modal">
                     <span>&times;</span>
                 </button>
diff --git a/client_login_import_modal.php b/client_login_import_modal.php
index 57d9b685..edf7edc4 100644
--- a/client_login_import_modal.php
+++ b/client_login_import_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-key"></i> Import Logins</h5>
+				<h5 class="modal-title"><i class="fa fa-fw fa-key"></i> Import Credentials</h5>
 				<button type="button" class="close text-white" data-dismiss="modal">
 					<span>&times;</span>
 				</button>
diff --git a/client_logins.php b/client_logins.php
index 90392fd2..3e9e7437 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -24,11 +24,11 @@ $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 mr-2"></i>Logins</h3>
+        <h3 class="card-title mt-2"><i class="fa fa-fw fa-key mr-2"></i>Credentials</h3>
         <div class="card-tools">
             <div class="btn-group">
                 <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addLoginModal">
-                    <i class="fas fa-plus mr-2"></i>New Login
+                    <i class="fas fa-plus mr-2"></i>New Credential
                 </button>
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
                 <div class="dropdown-menu">
@@ -50,7 +50,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(nullable_htmlentities($q)); } ?>" placeholder="Search Logins">
+                        <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Credentials">
                         <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 898465d2..8c911e84 100644
--- a/client_side_nav.php
+++ b/client_side_nav.php
@@ -127,7 +127,7 @@
                     <a href="client_logins.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_logins.php") { echo "active"; } ?>">
                         <i class="nav-icon fas fa-key"></i>
                         <p>
-                            Logins
+                            Credentials
                             <?php
                             if ($num_logins > 0) { ?>
                                 <span class="right badge text-light"><?php echo $num_logins; ?></span>
diff --git a/global_search.php b/global_search.php
index b722ee2d..bc1d0984 100644
--- a/global_search.php
+++ b/global_search.php
@@ -564,7 +564,7 @@ if (isset($_GET['query'])) {
             <div class="col-sm-6">
                 <div class="card mb-3">
                     <div class="card-header">
-                        <h6 class="mt-1"><i class="fas fa-fw fa-key mr-2"></i>Logins</h6>
+                        <h6 class="mt-1"><i class="fas fa-fw fa-key mr-2"></i>Credentials</h6>
                     </div>
                     <div class="card-body">
                         <table class="table table-striped table-borderless">
diff --git a/post/client.php b/post/client.php
index 7c2e998f..fd237583 100644
--- a/post/client.php
+++ b/post/client.php
@@ -731,7 +731,7 @@ if (isset($_POST['export_client_pdf'])) {
                 //Logins Start
                 <?php if(mysqli_num_rows($sql_logins) > 0 && $export_logins == 1){ ?>
                 {
-                    text: 'Logins',
+                    text: 'Credentials',
                     style: 'title'
                 },
 
diff --git a/post/login.php b/post/login.php
index 95b9aa43..e502eb8b 100644
--- a/post/login.php
+++ b/post/login.php
@@ -92,7 +92,7 @@ if (isset($_POST['export_client_logins_csv'])) {
 
     if ($num_rows > 0) {
         $delimiter = ",";
-        $filename = strtoAZaz09($client_name) . "-Logins-" . date('Y-m-d') . ".csv";
+        $filename = strtoAZaz09($client_name) . "-Credentials-" . date('Y-m-d') . ".csv";
 
         //create a file pointer
         $f = fopen('php://memory', 'w');