diff --git a/ajax.php b/ajax.php
index 8b595440e..bd8b61997 100644
--- a/ajax.php
+++ b/ajax.php
@@ -31,7 +31,7 @@ switch ($ajax->action) {
     case 'mod_action':
     case 'change_tor_status':
     case 'change_torrent':
-    case 'gen_passkey':
+    case 'passkey':
         require ATTACH_DIR . '/attachment_mod.php';
         break;
 }
diff --git a/library/ajax/gen_passkey.php b/library/ajax/passkey.php
similarity index 100%
rename from library/ajax/gen_passkey.php
rename to library/ajax/passkey.php
diff --git a/src/Ajax.php b/src/Ajax.php
index fc6c21215..b6311bafc 100644
--- a/src/Ajax.php
+++ b/src/Ajax.php
@@ -35,7 +35,7 @@ class Ajax
         'post_mod_comment' => ['mod'],
 
         'avatar' => ['user'],
-        'gen_passkey' => ['user'],
+        'passkey' => ['user'],
         'change_torrent' => ['user'],
         'change_tor_status' => ['user'],
         'manage_group' => ['user'],
@@ -302,13 +302,13 @@ class Ajax
     }
 
     /**
-     * Generate passkey actions
+     * Passkey actions
      *
      * @return void
      */
-    public function gen_passkey()
+    public function passkey()
     {
-        require AJAX_DIR . '/gen_passkey.php';
+        require AJAX_DIR . '/passkey.php';
     }
 
     /**
diff --git a/styles/templates/default/page_header.tpl b/styles/templates/default/page_header.tpl
index 73733d67d..741f01374 100644
--- a/styles/templates/default/page_header.tpl
+++ b/styles/templates/default/page_header.tpl
@@ -472,7 +472,7 @@ $(document).ready(function() {
 	<div id="main_content_wrap">
         <!-- IF NEED_GEN_PASSKEY -->
         <script type="text/javascript">
-            ajax.callback.gen_passkey = function (data) {
+            ajax.callback.passkey = function (data) {
                 if (data.first_creation) {
                     window.location.reload();
                 }
@@ -483,7 +483,7 @@ $(document).ready(function() {
             <h4 class="alert-heading">{L_PASSKEY_ALERT_TITLE}</h4>
             <hr>
             {L_PASSKEY_ALERT_INFO}
-            <a href="#" onclick="ajax.exec({ action: 'gen_passkey', mode: 'create', user_id: {SESSION_USER_ID} }); return false;">{L_BT_GEN_PASSKEY}</a>
+            <a href="#" onclick="ajax.exec({ action: 'passkey', mode: 'create', user_id: {SESSION_USER_ID} }); return false;">{L_BT_GEN_PASSKEY}</a>
         </div>
         <!-- ENDIF -->
 		<div id="latest_news">
diff --git a/styles/templates/default/usercp_viewprofile.tpl b/styles/templates/default/usercp_viewprofile.tpl
index faca3507d..9a0596422 100644
--- a/styles/templates/default/usercp_viewprofile.tpl
+++ b/styles/templates/default/usercp_viewprofile.tpl
@@ -168,7 +168,7 @@ ajax.callback.index_data = function(data) {
 
 <!-- IF SHOW_PASSKEY && not NEED_GEN_PASSKEY -->
 <script type="text/javascript">
-    ajax.callback.gen_passkey = function (data) {
+    ajax.callback.passkey = function (data) {
         if (data.first_creation || data.passkey_removed) {
             window.location.reload();
         } else if (data.passkey) {
@@ -401,7 +401,7 @@ ajax.callback.index_data = function(data) {
 					<!-- IF SHOW_PASSKEY -->
 					[ {L_BT_PASSKEY}: <span id="passkey-btn"><a class="med" href="#" onclick="$('#passkey-gen').show(); $('#passkey-btn').hide(); return false;">{L_BT_PASSKEY_VIEW}</a></span>
 					<span id="passkey-gen" class="med" style="display: none;">
-						<!-- IF AUTH_KEY --><b id="passkey" class="med bold">{AUTH_KEY}</b>&nbsp;|&nbsp;<a href="#" onclick="ajax.exec({ action: 'gen_passkey', mode: 'remove', user_id  : {PROFILE_USER_ID} }); return false;">{L_REMOVE}</a>&nbsp;&middot;&nbsp;<!-- ENDIF --><a href="#" onclick="ajax.exec({ action: 'gen_passkey', mode: 'create', user_id  : {PROFILE_USER_ID} }); return false;">{L_BT_GEN_PASSKEY}</a>
+						<!-- IF AUTH_KEY --><b id="passkey" class="med bold">{AUTH_KEY}</b>&nbsp;|&nbsp;<a href="#" onclick="ajax.exec({ action: 'passkey', mode: 'remove', user_id  : {PROFILE_USER_ID} }); return false;">{L_REMOVE}</a>&nbsp;&middot;&nbsp;<!-- ENDIF --><a href="#" onclick="ajax.exec({ action: 'passkey', mode: 'create', user_id  : {PROFILE_USER_ID} }); return false;">{L_BT_GEN_PASSKEY}</a>
 					</span> ]
 					<!-- ENDIF -->
 				</td>