diff --git a/toolbelt/src/main/java/org/rundeck/toolbelt/ToolBelt.java b/toolbelt/src/main/java/org/rundeck/toolbelt/ToolBelt.java
index 3160552..b2c3f16 100644
--- a/toolbelt/src/main/java/org/rundeck/toolbelt/ToolBelt.java
+++ b/toolbelt/src/main/java/org/rundeck/toolbelt/ToolBelt.java
@@ -684,7 +684,7 @@ private void introspect(CommandSet parent, final Object instance) {
         }
         if (!isSub) {
             parent.commands.put(cmd, commandSet);
-            parent.getSynonyms().addAll(synonyms);
+            synonyms.forEach(syn -> parent.commandSynonyms.put(syn, commandSet));
         } else {
             parent.commands.putAll(commandSet.commands);
             parent.commandSynonyms.putAll(subSynonyms);