diff --git a/js/menus/CamMenuView.js b/js/menus/CamMenuView.js
index 10a818f82e960d481723ba8eee25c9df2ac439bd..ac31cfcc8fa0fa969877efbf77aeab3c78b90d35 100644
--- a/js/menus/CamMenuView.js
+++ b/js/menus/CamMenuView.js
@@ -130,10 +130,10 @@ CamMenuView = Backbone.View.extend({
     template: _.template('\
         CAM output:   \
             <div class="btn-group">\
-                <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allCamProcesses[camProcess] %><span class="caret"></span></button>\
+                <button data-toggle="dropdown" class="btn dropdown-toggle" type="button"><%= allCamProcesses[machineName][camProcess] %><span class="caret"></span></button>\
                 <ul role="menu" class="dropdown-menu">\
-                    <% _.each(_.keys(allCamProcesses), function(key){ %>\
-                        <li><a class="camProcess" data-type="<%= key %>" href="#"><%= allCamProcesses[key] %></a></li>\
+                    <% _.each(_.keys(allCamProcesses[machineName]), function(key){ %>\
+                        <li><a class="camProcess" data-type="<%= key %>" href="#"><%= allCamProcesses[machineName][key] %></a></li>\
                     <% }); %>\
                 </ul>\
             </div><br/><br/>\
diff --git a/js/models/AppState.js b/js/models/AppState.js
index 33bd0b2aa44f140b47952bda122dd4d68725fe2c..31680394f0a332e71359b3807624b04ab479a846 100644
--- a/js/models/AppState.js
+++ b/js/models/AppState.js
@@ -127,8 +127,12 @@ AppState = Backbone.Model.extend({
             raster: "Raster"
         },
         allCamProcesses: {
-            shopbot: "Shopbot (sbp)",
-            gcode: "G-Code"
+            shopbot:{
+                shopbot: "Shopbot (sbp)",
+                gcode: "G-Code"
+            },
+            handOfGod:{gcode: "G-Code"},
+            oneBitBot:{gcode: "G-Code"}
         },
 
         allScripts: {