3 files changed, 9 insertions, 11 deletions

diff --git a/js/components/tools-properties/tag-properties.reel/tag-properties.html b/js/components/tools-properties/tag-properties.reel/tag-properties.html
index c7588b9e..2b81bb71 100644
--- a/js/components/tools-properties/tag-properties.reel/tag-properties.html
+++ b/js/components/tools-properties/tag-properties.reel/tag-properties.html
@@ -56,9 +56,9 @@
                     <label class="label"> Tag Name:</label>
 
                     <select id="customTagCB" class="nj-skinned">
-                        <option>Article</option>
-                        <option>Aside</option>
-                        <option>Section</option>
+                        <option>article</option>
+                        <option>aside</option>
+                        <option>section</option>
                     </select>
                 </div>
 
diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index aacb228c..ede71383 100644
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -122,7 +122,7 @@ exports.DragDropMediator = Montage.create(Component, {
 
                     NJUtils.makeElementModel(domElem, "SVG", "block");
                 } else { // treat as a regular image
-                    domElem = NJUtils.makeNJElement("image", "Image", "block");
+                    domElem = NJUtils.makeNJElement("image", "image", "image");
                     domElem.src = evt2.currentTarget.result;
                 }
 
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index c527edf3..e3f49bbe 100644
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -158,19 +158,17 @@ exports.TagTool = Montage.create(DrawingTool, {
             selectedTag = this.options.selectedElement;
 
             if(selectedTag === "divTool") {
-                newTag = NJUtils.makeNJElement("div", "Div", "block");
+                newTag = NJUtils.makeNJElement("div", "div", "block");
             } else if(selectedTag === "imageTool") {
-                newTag = NJUtils.makeNJElement("image", "Image", "image");
+                newTag = NJUtils.makeNJElement("image", "image", "image");
             } else if(selectedTag === "videoTool") {
-                newTag = NJUtils.makeNJElement("video", "Video", "video", {
+                newTag = NJUtils.makeNJElement("video", "video", "video", {
                         innerHTML: "Your browser does not support the VIDEO element."
                 });
             } else if(selectedTag === "canvasTool") {
-                newTag = NJUtils.makeNJElement("canvas", "Canvas", "canvas");
+                newTag = NJUtils.makeNJElement("canvas", "canvas", "canvas");
             } else if(selectedTag === "customTool") {
-                newTag = document.createElement(this.options.customName.value);
-                newTag.Ninja = {};
-                newTag.Ninja.selectionType = this.options.customName.value;
+                newTag = NJUtils.makeNJElement(this.options.customName.value, this.options.customName.value, "block");
             }
             /* SWF Tag tool - Not used for now. Will revisit this at a later time.
             else if(selectedTag === "flashTool") {