diff --git a/lib/document_handler.js b/lib/document_handler.js
index 742e910..9ede846 100644
--- a/lib/document_handler.js
+++ b/lib/document_handler.js
@@ -32,11 +32,10 @@ DocumentHandler.prototype.handlePost = function(request, response) {
   });
   request.on('end', function(end) {
     winston.verbose('added document', { key: key });
-    response.end(JSON.stringify({ uuid: key }));
+    response.end(JSON.stringify({ key: key }));
   });
   request.on('error', function(error) {
     // TODO handle error
-    // TODO rename key to uuid everywhere behind the scenes
     // TODO finish all TODOs
   });
 };
diff --git a/static/application.js b/static/application.js
index 9e5b95a..3196efd 100644
--- a/static/application.js
+++ b/static/application.js
@@ -20,7 +20,7 @@ heist_document.prototype.load = function(key, callback) {
       var high = hljs.highlightAuto(res.data);
       callback({
         value: high.value,
-        uuid: key,
+        key: key,
         language: high.language
       });
     }
@@ -48,7 +48,7 @@ heist_document.prototype.save = function(data, callback) {
       var high = hljs.highlightAuto(data);
       callback({
         value: high.value,
-        uuid: res.uuid,
+        key: res.key,
         language: high.language
       });
     }
@@ -115,7 +115,7 @@ heist.prototype.lockDocument = function() {
     if (ret) {
       _this.$code.html(ret.value);
       _this.setTitle(ret.language ? ret.language : 'unknown');
-      window.history.pushState(null, _this.appName + '-' + ret.uuid, '/' + ret.uuid);
+      window.history.pushState(null, _this.appName + '-' + ret.key, '/' + ret.key);
       _this.$textarea.val('').hide();
       _this.$box.show();
     }