--- a/SkeletonKey/ActionTemplates.lua	Sat Sep 10 20:39:53 2016 -0400
+++ b/SkeletonKey/ActionTemplates.lua	Sat Sep 10 20:56:19 2016 -0400
@@ -97,7 +97,7 @@
 end
 
 atype['item'] = function(id, name)
-  return CLICK_KEYBINDER_KEY, 'item_' .. tostring(name), id
+  return CLICK_KEYBINDER_KEY, tostring(name), id
 end
 
 
@@ -137,38 +137,32 @@
   kb.LoadBinding = function(command, name, icon, actionType, actionID, macroName, macroText )
 
     local indexKey = actionType..'_'..actionID
-    local buttonTypeKey, buttonTypeValue = "*type-"..name, actionType
-    local buttonActionKey, buttonActionValue = "*"..actionType.."-"..name, actionID
+    local buttonTypeSuffix, buttonType = name, actionType
+    local actionKey, actionValue = "*"..actionType.."-"..name, actionID
     local button = key
     if actionType == 'spell' then
-      buttonTypeKey = name
-      buttonTypeValue = actionType
-      buttonActionKey = "*"..actionType.."-"..name
-      buttonActionValue = name
+      buttonTypeSuffix = name
+      buttonType = actionType
+      actionValue = name
     elseif actionType == 'item' then
-      buttonTypeKey = name
-      buttonTypeValue = actionType
-      buttonActionKey = "*"..actionType.."-"..name
-      buttonActionValue = actionID
-    elseif actionType == 'macro' then
-      button = macro
-      buttonTypeKey = macroName
-      buttonTypeValue = "macro"
-      buttonActionKey = "*macro-" .. macroName
-      buttonActionValue = name
+      buttonTypeSuffix = name
+      buttonType = actionType
+      actionValue = name
     else
       button = macro
-      buttonTypeKey = macroName
-      buttonTypeValue = macroText
-      buttonActionKey = nil
+      buttonTypeSuffix = macroName
+      buttonType = 'macro'
+      if actionType == 'macro' then
+        actionKey = "*macro-" .. macroName
+        actionValue = name
+      else
+        actionKey = '*macrotext-'..macroName
+        actionValue = macroText
+      end
     end
 
-    --cprint(actionType, actionID, name)
-    kb.SecureAttribute(button, "*type-"..buttonTypeKey, buttonTypeValue)
-    if buttonActionKey then
-      --cprint(button:GetName(), buttonActionKey,'=', buttonActionValue)
-      kb.SecureAttribute(button, buttonActionKey, buttonActionValue)
-    end
+    kb.SecureAttribute(button, "*type-"..buttonTypeSuffix, buttonType)
+    kb.SecureAttribute(button, actionKey, actionValue)
 
     kb.bindings[indexKey] = kb.bindings[indexKey] or {}
     kb.bindings[command] = kb.bindings[indexKey]