diff --git a/src/js/config/Categories.js b/src/js/config/Categories.js
index 677f47c3..ef922682 100755
--- a/src/js/config/Categories.js
+++ b/src/js/config/Categories.js
@@ -96,11 +96,11 @@ var Categories = [
             "PGP Decrypt",
             "PGP Sign",
             "PGP Verify",
-            "PGP Sign Cleartext",
-            "PGP Verify Cleartext",
-            "PGP Generate Key Pair",
-            "PGP Add ASCII Armor",
-            "PGP Remove ASCII Armor",
+            "Sign PGP Cleartext",
+            "Verify PGP Cleartext",
+            "Generate PGP Key Pair",
+            "Add PGP ASCII Armor",
+            "Remove PGP ASCII Armor",
         ]
     },
     {
@@ -116,11 +116,11 @@ var Categories = [
             "PGP Decrypt",
             "PGP Sign",
             "PGP Verify",
-            "PGP Sign Cleartext",
-            "PGP Verify Cleartext",
-            "PGP Generate Key Pair",
-            "PGP Add ASCII Armor",
-            "PGP Remove ASCII Armor",
+            "Sign PGP Cleartext",
+            "Verify PGP Cleartext",
+            "Generate PGP Key Pair",
+            "Add PGP ASCII Armor",
+            "Remove PGP ASCII Armor",
         ]
     },
     {
diff --git a/src/js/config/OperationConfig.js b/src/js/config/OperationConfig.js
index 013d016f..6f6c59c1 100755
--- a/src/js/config/OperationConfig.js
+++ b/src/js/config/OperationConfig.js
@@ -3230,7 +3230,7 @@ var OperationConfig = {
             }
         ]
     },
-    "PGP Sign Cleartext": {
+    "Sign PGP Cleartext": {
         description: "Input: An ASCII-Armored PGP private key (and optionally, the password needed to decrypt the private key).<br><br>This operation uses PGP to produce a digital signature.<br><br>Pretty Good Privacy is an encryption standard (OpenPGP) used for encrypting, decrypting, and signing messages.<br><br>This function relies on OpenPGP.js for the implementation of PGP.<br><br>See more at https://openpgpjs.org/",
         run: PGP.runSignCleartext,
         inputType: "string",
@@ -3248,7 +3248,7 @@ var OperationConfig = {
             },
         ]
     },
-    "PGP Verify Cleartext": {
+    "Verify PGP Cleartext": {
         description: "Input: An ASCII-Armored PGP public key.<br><br>This operation uses PGP to verify a cleartext digital signature.<br><br>Pretty Good Privacy is an encryption standard (OpenPGP) used for encrypting, decrypting, and signing messages.<br><br>This function relies on OpenPGP.js for the implementation of PGP.<br><br>See more at https://openpgpjs.org/",
         run: PGP.runVerifyCleartext,
         inputType: "string",
@@ -3266,7 +3266,7 @@ var OperationConfig = {
             }
         ]
     },
-    "PGP Generate Key Pair": {
+    "Generate PGP Key Pair": {
         description: "Input is ignored.<br><br>This operation generates a PGP key pair.<br><br>Pretty Good Privacy is an encryption standard (OpenPGP) used for encrypting, decrypting, and signing messages.<br><br>This function relies on OpenPGP.js for the implementation of PGP.<br><br>See more at https://openpgpjs.org/",
         run: PGP.runGenKeyPair,
         inputType: "string",
@@ -3294,7 +3294,7 @@ var OperationConfig = {
             },
         ]
     },
-    "PGP Add ASCII Armor": {
+    "Add PGP ASCII Armor": {
         description: "",
         run: PGP.runAddArmor,
         inputType: "byteArray",
@@ -3307,7 +3307,7 @@ var OperationConfig = {
             },
         ],
     },
-    "PGP Remove ASCII Armor": {
+    "Remove PGP ASCII Armor": {
         description: "",
         run: PGP.runRemoveArmor,
         inputType: "string",
diff --git a/test/tests/operations/PGP.js b/test/tests/operations/PGP.js
index e19db6b4..d11b8595 100644
--- a/test/tests/operations/PGP.js
+++ b/test/tests/operations/PGP.js
@@ -354,7 +354,7 @@ TestRegister.addTests([{
 ["", "hello world"].forEach(function(input) {
     TestRegister.addTests(
         PGP_TEST_KEY_PAIRS.map(function(keyPair) {
-            var testName = "PGP Sign Cleartext, PGP Verify Cleartext ($pw, $ks) '$input'";
+            var testName = "Sign PGP Cleartext, Verify PGP Cleartext ($pw, $ks) '$input'";
             testName = testName.replace("$ks", keyPair.size);
             testName = testName.replace("$pw", keyPair.password ? "pw" : "no pw");
             testName = testName.replace("$input", input);
@@ -373,11 +373,11 @@ TestRegister.addTests([{
                 ].join("\n"),
                 recipeConfig: [
                     {
-                        op: "PGP Sign Cleartext",
+                        op: "Sign PGP Cleartext",
                         args: [keyPair.sec, keyPair.password],
                     },
                     {
-                        op: "PGP Verify Cleartext",
+                        op: "Verify PGP Cleartext",
                         args: [keyPair.pub, true],
                     },
                 ],
@@ -389,7 +389,7 @@ TestRegister.addTests([{
 ["", "hello world"].forEach(function(input) {
     TestRegister.addTests(
         PGP_TEST_KEY_PAIRS.map(function(keyPair) {
-            var testName = "PGP Sign Cleartext, PGP Verify Cleartext ($pw, $ks) '$input' (message hidden)";
+            var testName = "Sign Sign Cleartext, Verify PGP Cleartext ($pw, $ks) '$input' (message hidden)";
             testName = testName.replace("$ks", keyPair.size);
             testName = testName.replace("$pw", keyPair.password ? "pw" : "no pw");
             testName = testName.replace("$input", input);
@@ -408,11 +408,11 @@ TestRegister.addTests([{
                 ].join("\n"),
                 recipeConfig: [
                     {
-                        op: "PGP Sign Cleartext",
+                        op: "Sign PGP Cleartext",
                         args: [keyPair.sec, keyPair.password],
                     },
                     {
-                        op: "PGP Verify Cleartext",
+                        op: "Verify PGP Cleartext",
                         args: [keyPair.pub, false],
                     },
                 ],
@@ -422,7 +422,7 @@ TestRegister.addTests([{
 });
 
 TestRegister.addTests(CYBERCHEF_GENERATED_KEY_PAIRS.map(function(keyPair) {
-    var testName = "PGP Remove ASCII Armor, PGP Add ASCII Armor: Public Key '$name'";
+    var testName = "Remove PGP ASCII Armor, Add PGP ASCII Armor: Public Key '$name'";
     testName = testName.replace("$name", keyPair.name);
 
     return {
@@ -432,11 +432,11 @@ TestRegister.addTests(CYBERCHEF_GENERATED_KEY_PAIRS.map(function(keyPair) {
         ignoreWhitespace: true,
         recipeConfig: [
             {
-                op: "PGP Remove ASCII Armor",
+                op: "Remove PGP ASCII Armor",
                 args: [],
             },
             {
-                op: "PGP Add ASCII Armor",
+                op: "Add PGP ASCII Armor",
                 args: ["Public key"],
             },
         ],
@@ -444,7 +444,7 @@ TestRegister.addTests(CYBERCHEF_GENERATED_KEY_PAIRS.map(function(keyPair) {
 }));
 
 TestRegister.addTests(CYBERCHEF_GENERATED_KEY_PAIRS.map(function(keyPair) {
-    var testName = "PGP Remove ASCII Armor, PGP Add ASCII Armor: Private Key '$name'";
+    var testName = "Remove PGP ASCII Armor, Add PGP ASCII Armor: Private Key '$name'";
     testName = testName.replace("$name", keyPair.name);
 
     return {
@@ -454,11 +454,11 @@ TestRegister.addTests(CYBERCHEF_GENERATED_KEY_PAIRS.map(function(keyPair) {
         ignoreWhitespace: true,
         recipeConfig: [
             {
-                op: "PGP Remove ASCII Armor",
+                op: "Remove PGP ASCII Armor",
                 args: [],
             },
             {
-                op: "PGP Add ASCII Armor",
+                op: "Add PGP ASCII Armor",
                 args: ["Private key"],
             },
         ],
@@ -467,7 +467,7 @@ TestRegister.addTests(CYBERCHEF_GENERATED_KEY_PAIRS.map(function(keyPair) {
 
 CYBERCHEF_GENERATED_KEY_PAIRS.forEach(function(keyPair) {
     TestRegister.addTests(keyPair.messages.map(function(encryptedMessage, messageIndex) {
-        var testName = "PGP Remove ASCII Armor, PGP Add ASCII Armor: Message $message '$name'";
+        var testName = "Remove PGP ASCII Armor, Add PGP ASCII Armor: Message $message '$name'";
         testName = testName.replace("$message", messageIndex);
         testName = testName.replace("$name", keyPair.name);
 
@@ -478,11 +478,11 @@ CYBERCHEF_GENERATED_KEY_PAIRS.forEach(function(keyPair) {
             ignoreWhitespace: true,
             recipeConfig: [
                 {
-                    op: "PGP Remove ASCII Armor",
+                    op: "Remove PGP ASCII Armor",
                     args: [],
                 },
                 {
-                    op: "PGP Add ASCII Armor",
+                    op: "Add PGP ASCII Armor",
                     args: ["Message"],
                 },
             ],