diff --git a/bower.json b/bower.json
index 6fb67b6..10f0efa 100644
--- a/bower.json
+++ b/bower.json
@@ -21,7 +21,7 @@
     "moment": "timrwood/moment#2.0.0",
     "backbone": "1.0.0",
     "backbone.marionette": "v1.0.3",
-    "aloha-editor": "oerpub/Aloha-Editor#master",
+    "aloha-editor": "oerpub/Aloha-Editor#use-data-label-instead-of-type",
     "bootstrap": "v2.3.2",
     "filtered-collection": "dlikhten/filtered-collection",
     "jsdifflib": "philschatz/jsdifflib#master"
diff --git a/scripts/configs/aloha.coffee b/scripts/configs/aloha.coffee
index bcb14ba..32b8178 100644
--- a/scripts/configs/aloha.coffee
+++ b/scripts/configs/aloha.coffee
@@ -111,12 +111,12 @@ define ['jquery'], ($) ->
               console.log 'Updated Image src as a result of upload'
 
       note: [
-        { label: 'Note',      cls: 'note', hasTitle: true }
-        { label: 'Aside',     cls: 'note', hasTitle: true, type: 'aside' }
-        { label: 'Warning',   cls: 'note', hasTitle: true, type: 'warning' }
-        { label: 'Tip',       cls: 'note', hasTitle: true, type: 'tip' }
-        { label: 'Important', cls: 'note', hasTitle: true, type: 'important' }
-        { label: 'Teacher\'s Guide', cls: 'note', hasTitle: true, type: 'teachers-guide' }
+        { label: 'Note',      typeClass: 'note', hasTitle: true }
+        { label: 'Aside',     typeClass: 'note', hasTitle: true, dataClass: 'aside' }
+        { label: 'Warning',   typeClass: 'note', hasTitle: true, dataClass: 'warning' }
+        { label: 'Tip',       typeClass: 'note', hasTitle: true, dataClass: 'tip' }
+        { label: 'Important', typeClass: 'note', hasTitle: true, dataClass: 'important' }
+        { label: "Teacher's Guide", typeClass: 'note', hasTitle: true, dataClass: 'teachers-guide' }
       ]
       block:
         dragdrop: "1"
diff --git a/templates/layouts/workspace/menu.html b/templates/layouts/workspace/menu.html
index 2ba10db..c6dde8b 100644
--- a/templates/layouts/workspace/menu.html
+++ b/templates/layouts/workspace/menu.html
@@ -13,7 +13,7 @@
         <div class="note">
             <div class="title"></div>
         </div>
-        <div class="example" data-type="activity">
+        <div class="example" data-label="Activity">
             <div class="title"></div>
         </div>