diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 523a47e3..f131c3d6 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -119,50 +119,50 @@ copy({
     dest: 'build/src/ace-uncompressed.js'
 });
 
-console.log('# cockpit ---------');
+console.log('# gcli ---------');
 
 project.assumeAllFilesLoaded();
-project.addRoot(aceHome + '/support/cockpit/lib');
+project.addRoot(aceHome + '/support/gcli/lib');
 
-var cockpit = copy.createDataObject();
+var gcli = copy.createDataObject();
 copy({
     source: [
         copy.source.commonjs({
             project: project,
-            require: [ 'cockpit/index' ]
+            require: [ 'gcli/index' ]
         })
     ],
     filter: [ copy.filter.moduleDefines ],
-    dest: cockpit
+    dest: gcli
 });
 copy({
     source: {
-        root: aceHome + '/support/cockpit/lib',
+        root: aceHome + '/support/gcli/lib',
         include: /.*\.css$|.*\.html$/,
         exclude: /tests?\//
     },
     filter: [ copy.filter.addDefines ],
-    dest: cockpit
+    dest: gcli
 });
 copy({
     source: {
-        root: aceHome + '/support/cockpit/lib',
+        root: aceHome + '/support/gcli/lib',
         include: /.*\.png$|.*\.gif$/,
         exclude: /tests?\//
     },
     filter: [ copy.filter.base64 ],
-    dest: cockpit
+    dest: gcli
 });
 
 // Create the compressed and uncompressed output files
 copy({
-    source: cockpit,
+    source: gcli,
     filter: copy.filter.uglifyjs,
-    dest: 'build/src/cockpit.js'
+    dest: 'build/src/gcli.js'
 });
 copy({
-    source: cockpit,
-    dest: 'build/src/cockpit-uncompressed.js'
+    source: gcli,
+    dest: 'build/src/gcli-uncompressed.js'
 });
 
 
@@ -270,7 +270,7 @@ copy({
 //    source: aceHome + "/editor.html",
 //    filter: [ function(data) {
 //        var includes = [
-//            "ace", "cockpit",
+//            "ace", "gcli",
 //            "keybinding-vim", "keybinding-emacs",
 //            "mode-javascript", "mode-css", "mode-html", "mode-php", "mode-python",
 //            "mode-xml",
diff --git a/demo/boot.js b/demo/boot.js
index 7ea62eb0..9c577c9b 100644
--- a/demo/boot.js
+++ b/demo/boot.js
@@ -39,7 +39,7 @@ require({
     paths: {
         demo: "../demo",
         ace: "../lib/ace",
-        cockpit: "../support/cockpit/lib/cockpit",
+        gcli: "../support/cockpit/lib/gcli",
         pilot: "../support/cockpit/support/pilot/lib/pilot"
     }
 });
@@ -54,11 +54,11 @@ var deps = [
 require(deps, function() {
     var catalog = require("ace/plugin_manager").catalog;
 
-    var plugins = [ "cockpit/index", "ace/index" ];
+    var plugins = [ "gcli/index", "ace/index" ];
     catalog.registerPlugins(plugins).then(function() {
         var env = require("ace/environment").create();
         catalog.startupPlugins({ env: env }).then(function() {
-            var gcli = require("cockpit/index");
+            var gcli = require("gcli/index");
             new gcli.CliView({ env: env });
 
             require("demo/demo").launch(env);
diff --git a/demo/demo.js b/demo/demo.js
index f9603a41..26d49e34 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -42,7 +42,7 @@ define(function(require, exports, module) {
 var keybinding = require('ace/keyboard/keybinding');
 
 exports.launch = function(env) {
-    var gcli = require("cockpit/index");
+    var gcli = require("gcli/index");
     var event = require("pilot/event");
     var Editor = require("ace/editor").Editor;
     var Renderer = require("ace/virtual_renderer").VirtualRenderer;
diff --git a/demo/styles.css b/demo/styles.css
index 1833a277..0d9af881 100644
--- a/demo/styles.css
+++ b/demo/styles.css
@@ -26,7 +26,7 @@ body {
     width: 100%;
 }
 
-#cockpitInput {
+#gcliInput {
     position: absolute;
     width: 100%;
     bottom: 0;
@@ -36,7 +36,7 @@ body {
     font-size: 120%;
 }
 
-#cockpitOutput {
+#gcliOutput {
     margin: 0 15px;
     border: 1px solid #AAA;
     -moz-border-radius-topleft: 10px;
diff --git a/index.html b/index.html
index 4cdac4cd..8a3b0df3 100644
--- a/index.html
+++ b/index.html
@@ -448,7 +448,7 @@ bg. Blockquote!
 
 </script>
 
-  <input id="cockpitInput" type="text"/>
+  <input id="gcliInput" type="text"/>
 
   <script src="demo/require.js" type="text/javascript" charset="utf-8"></script>
   <script src="demo/boot.js" type="text/javascript"></script>
diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index f219f4e5..35e5adeb 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -42,7 +42,7 @@ define(function(require, exports, module) {
 
 
 var lang = require("pilot/lang");
-var gcli = require("cockpit/index");
+var gcli = require("gcli/index");
 var keybinding = require('ace/keyboard/keybinding');
 
 /**
diff --git a/lib/ace/commands/settings.js b/lib/ace/commands/settings.js
index b42530da..843ee817 100644
--- a/lib/ace/commands/settings.js
+++ b/lib/ace/commands/settings.js
@@ -38,7 +38,7 @@
 define(function(require, exports, module) {
 
 
-var gcli = require('cockpit/index');
+var gcli = require('gcli/index');
 
 var pref = {
     metadata: {
diff --git a/lib/ace/keyboard/keybinding.js b/lib/ace/keyboard/keybinding.js
index 96c33707..b37b8723 100644
--- a/lib/ace/keyboard/keybinding.js
+++ b/lib/ace/keyboard/keybinding.js
@@ -45,7 +45,7 @@ var typecheck = require('pilot/typecheck');
 
 var keyUtil  = require('ace/keys');
 var settings  = require('ace/settings').settings;
-var Requisition = require('cockpit/index').Requisition;
+var Requisition = require('gcli/index').Requisition;
 
 var KeyBinding = function(editor) {
     this.$editor = editor;
diff --git a/lib/ace/settings.js b/lib/ace/settings.js
index d7da7094..fae12163 100644
--- a/lib/ace/settings.js
+++ b/lib/ace/settings.js
@@ -44,12 +44,12 @@ define(function(require, exports, module) {
 
 var console = require('pilot/console');
 var oop = require('pilot/oop');
-var types = require('cockpit/types');
+var types = require('gcli/types');
 var EventEmitter = require('pilot/event_emitter').EventEmitter;
 
-var SelectionType = require('cockpit/types').SelectionType;
-var DeferredType = require('cockpit/types').DeferredType;
-var Argument = require('cockpit/argument').Argument;
+var SelectionType = require('gcli/types').SelectionType;
+var DeferredType = require('gcli/types').DeferredType;
+var Argument = require('gcli/argument').Argument;
 
 
 /**
diff --git a/lib/ace/test/tests.html b/lib/ace/test/tests.html
index 2af7ea55..bccc7388 100644
--- a/lib/ace/test/tests.html
+++ b/lib/ace/test/tests.html
@@ -29,7 +29,7 @@
 require({
     paths: {
         ace: "../lib/ace",
-        cockpit: "../support/cockpit/lib/cockpit",
+        gcli: "../support/gcli/lib/gcli",
         pilot: "../support/pilot/lib/pilot"
     },
     packages : [{
diff --git a/support/cockpit b/support/cockpit
index 193f1c44..7a14c62f 160000
--- a/support/cockpit
+++ b/support/cockpit
@@ -1 +1 @@
-Subproject commit 193f1c44bbb260c737ef077a47e638899a9375f7
+Subproject commit 7a14c62f84cf51e83a31b14d9a79f875bcabeacc