diff --git a/src/js/commands/index.js b/src/js/commands/index.js
index 2dac458c..41ddefeb 100644
--- a/src/js/commands/index.js
+++ b/src/js/commands/index.js
@@ -36,7 +36,7 @@ var commands = {
       // a different command at each step
       _.each(result.multiDelegate, function(delConfig) {
         // copy command, and then set opts
-        commandObj.setSupportedMap(delConfig.options || {});
+        commandObj.setOptionsMap(delConfig.options || {});
         commandObj.setGeneralArgs(delConfig.args || []);
         
         commandConfigs[delConfig.vcs][delConfig.name].execute.call(this, engine, commandObj);
diff --git a/src/js/git/commands.js b/src/js/git/commands.js
index 048f2e89..6088682d 100644
--- a/src/js/git/commands.js
+++ b/src/js/git/commands.js
@@ -18,7 +18,7 @@ var commandConfig = {
       '-m'
     ],
     execute: function(engine, command) {
-      var commandOptions = command.getSupportedMap();
+      var commandOptions = command.getOptionsMap();
       command.acceptNoGeneralArgs();
 
       if (commandOptions['-am'] && (
@@ -70,7 +70,7 @@ var commandConfig = {
     displayName: 'cherry-pick',
     regex: /^git +cherry-pick($|\s)/,
     execute: function(engine, command) {
-      var commandOptions = command.getSupportedMap();
+      var commandOptions = command.getOptionsMap();
       var generalArgs = command.getGeneralArgs();
 
       command.validateArgBounds(generalArgs, 1, Number.MAX_VALUE);
@@ -107,7 +107,7 @@ var commandConfig = {
         });
       }
 
-      var commandOptions = command.getSupportedMap();
+      var commandOptions = command.getOptionsMap();
       command.acceptNoGeneralArgs();
       engine.pull({
         isRebase: commandOptions['--rebase']
@@ -176,7 +176,7 @@ var commandConfig = {
       '--contains'
     ],
     execute: function(engine, command) {
-      var commandOptions = command.getSupportedMap();
+      var commandOptions = command.getOptionsMap();
       var generalArgs = command.getGeneralArgs();
 
       var args = null;
@@ -244,7 +244,7 @@ var commandConfig = {
       '--soft'
     ],
     execute: function(engine, command) {
-      var commandOptions = command.getSupportedMap();
+      var commandOptions = command.getOptionsMap();
       var generalArgs = command.getGeneralArgs();
 
       if (commandOptions['--soft']) {
@@ -344,7 +344,7 @@ var commandConfig = {
     ],
     regex: /^git +rebase($|\s)/,
     execute: function(engine, command) {
-      var commandOptions = command.getSupportedMap();
+      var commandOptions = command.getOptionsMap();
       var generalArgs = command.getGeneralArgs();
 
       if (commandOptions['-i']) {
@@ -383,7 +383,7 @@ var commandConfig = {
       '-'
     ],
     execute: function(engine, command) {
-      var commandOptions = command.getSupportedMap();
+      var commandOptions = command.getOptionsMap();
       var generalArgs = command.getGeneralArgs();
 
       var args = null;
diff --git a/src/js/mercurial/commands.js b/src/js/mercurial/commands.js
index f3645f48..bf588d06 100644
--- a/src/js/mercurial/commands.js
+++ b/src/js/mercurial/commands.js
@@ -18,7 +18,7 @@ var commandConfig = {
       '-m'
     ],
     delegate: function(engine, command) {
-      var options = command.getSupportedMap();
+      var options = command.getOptionsMap();
       if (options['-A']) {
         command.addWarning(intl.str('hg-a-option'));
       }
@@ -59,7 +59,7 @@ var commandConfig = {
     ],
     delegate: function(engine, command) {
       command.appendOptionR();
-      var options = command.getSupportedMap();
+      var options = command.getOptionsMap();
       if (!options['-r']) {
         throw new GitError({
           msg: intl.str('git-error-options')
@@ -80,7 +80,7 @@ var commandConfig = {
     ],
     dontCountForGolf: true,
     delegate: function(engine, command) {
-      var options = command.getSupportedMap();
+      var options = command.getOptionsMap();
       command.acceptNoGeneralArgs();
 
       if (!options['-f']) {
@@ -104,7 +104,7 @@ var commandConfig = {
       '-d'
     ],
     delegate: function(engine, command) {
-      var options = command.getSupportedMap();
+      var options = command.getOptionsMap();
       var generalArgs = command.getGeneralArgs();
       var branchName;
       var rev;
@@ -145,7 +145,7 @@ var commandConfig = {
           delegate.name = 'branch';
           command.setGeneralArgs([branchName, rev]);
         } else if (generalArgs.length > 0) {
-          command.setSupportedMap({'-b': [generalArgs[0]]});
+          command.setOptionsMap({'-b': [generalArgs[0]]});
           delegate.name = 'checkout';
           command.setGeneralArgs([]);
         } else {
@@ -171,7 +171,7 @@ var commandConfig = {
         });
       };
 
-      var options = command.getSupportedMap();
+      var options = command.getOptionsMap();
       // if we have both OR if we have neither
       if ((options['-d'] && options['-s']) ||
           (!options['-d'] && !options['-s'])) {
@@ -181,9 +181,9 @@ var commandConfig = {
         options['-b'] = ['.'];
       }
 
-      command.setSupportedMap(options);
+      command.setOptionsMap(options);
       command.mapDotToHead();
-      options = command.getSupportedMap();
+      options = command.getOptionsMap();
 
       if (options['-d']) {
         var dest = options['-d'][0] || throwE();
@@ -229,7 +229,7 @@ var commandConfig = {
     delegate: function(engine, command) {
       var args = command.getGeneralArgs();
       command.validateArgBounds(args, 1, 1);
-      command.setSupportedMap({
+      command.setOptionsMap({
         '-i': args
       });
       command.setGeneralArgs([]);
diff --git a/src/js/models/commandModel.js b/src/js/models/commandModel.js
index 64c2a604..ec842b9e 100644
--- a/src/js/models/commandModel.js
+++ b/src/js/models/commandModel.js
@@ -61,7 +61,7 @@ var Command = Backbone.Model.extend({
    * args for git
    */
   appendOptionR: function() {
-    var rOptions = this.getSupportedMap()['-r'] || [];
+    var rOptions = this.getOptionsMap()['-r'] || [];
     this.setGeneralArgs(
       this.getGeneralArgs().concat(rOptions)
     );
@@ -69,7 +69,7 @@ var Command = Backbone.Model.extend({
 
   mapDotToHead: function() {
     var generalArgs = this.getGeneralArgs();
-    var options = this.getSupportedMap();
+    var options = this.getOptionsMap();
     
     generalArgs = _.map(generalArgs, function(arg) {
       return this.replaceDotWithHead(arg);
@@ -81,15 +81,15 @@ var Command = Backbone.Model.extend({
       }, this);
     }, this);
     this.setGeneralArgs(generalArgs);
-    this.setSupportedMap(newMap);
+    this.setOptionsMap(newMap);
   },
 
   deleteOptions: function(options) {
-    var map = this.getSupportedMap();
+    var map = this.getOptionsMap();
     _.each(options, function(option) {
       delete map[option];
     }, this);
-    this.setSupportedMap(map);
+    this.setOptionsMap(map);
   },
 
   getGeneralArgs: function() {
@@ -100,11 +100,11 @@ var Command = Backbone.Model.extend({
     this.set('generalArgs', args);
   },
 
-  setSupportedMap: function(map) {
+  setOptionsMap: function(map) {
     this.set('supportedMap', map);
   },
 
-  getSupportedMap: function() {
+  getOptionsMap: function() {
     return this.get('supportedMap');
   },