diff --git a/src/core/operations/GenerateUUID.mjs b/src/core/operations/GenerateUUID.mjs
index 89a5e05c..32360042 100644
--- a/src/core/operations/GenerateUUID.mjs
+++ b/src/core/operations/GenerateUUID.mjs
@@ -26,15 +26,15 @@ class GenerateUUID extends Operation {
         this.outputType = "string";
         this.args = [
             {
-                name: "UUID Version",
+                name: "Version",
+                hint: "UUID version",
                 type: "option",
-                value: [
-                    "v1", "v3", "v4", "v5", "v6", "v7",
-                ]
+                value: ["v1", "v3", "v4", "v5", "v6", "v7"],
                 defaultIndex: 2,
             },
             {
-                name: "UUID namespace (valid for v3 and v5)",
+                name: "Namespace",
+                hint: "UUID namespace (UUID; valid for v3 and v5)",
                 type: "string",
                 value: "1b671a64-40d5-491e-99b0-da01ff1f3341"
             }
@@ -51,9 +51,7 @@ class GenerateUUID extends Operation {
         const hasDesiredVersion = typeof uuid[version] === "function";
         if (!hasDesiredVersion) throw new OperationError("Invalid UUID version");
 
-        const versionThatRequiresNamespace = ["v3", "v5"];
-
-        const requiresNamespace = versionThatRequiresNamespace.includes(version);
+        const requiresNamespace = ["v3", "v5"].includes(version);
         if (!requiresNamespace) return uuid[version]();
 
         const hasValidNamespace = typeof namespace === "string" && uuid.validate(namespace);
diff --git a/tests/node/tests/operations.mjs b/tests/node/tests/operations.mjs
index ec55b768..022b0701 100644
--- a/tests/node/tests/operations.mjs
+++ b/tests/node/tests/operations.mjs
@@ -581,13 +581,13 @@ Password: 282760`;
     }),
 
     ...[1, 3, 4, 5, 6, 7].map(version => it(`Generate UUID v${version}`, () => {
-        const result = chef.generateUUID("", { "UUID version": `v${version}` }).toString();
+        const result = chef.generateUUID("", { "version": `v${version}` }).toString();
         assert.ok(result);
         assert.strictEqual(result.length, 36);
     })),
 
     ...[1, 3, 4, 5, 6, 7].map(version => it(`Analyze UUID v${version}`, () => {
-        const uuid = chef.generateUUID("", { "UUID version": `v${version}` }).toString();
+        const uuid = chef.generateUUID("", { "version": `v${version}` }).toString();
         const result = chef.analyseUUID(uuid).toString();
         const expected = `UUID version: ${version}`;
         assert.strictEqual(result, expected);