8 files changed, 24 insertions, 40 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.html b/js/components/ui/color-chip.reel/color-chip.html
index a365d775..8f10092d 100755
--- a/js/components/ui/color-chip.reel/color-chip.html
+++ b/js/components/ui/color-chip.reel/color-chip.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
    <script type="text/montage-serialization">
    {
        "owner": {
-            "module": "js/components/ui/color-chip.reel",
+            "prototype": "js/components/ui/color-chip.reel",
-            "name": "ColorChip",
            "properties": {
                "element":  {"#": "colorChipContainer"},
                "icon":     {"#": "chipIcon"},
diff --git a/js/components/ui/file-input.reel/file-input.html b/js/components/ui/file-input.reel/file-input.html
index 2a8546a5..0c3c465e 100755
--- a/js/components/ui/file-input.reel/file-input.html
+++ b/js/components/ui/file-input.reel/file-input.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
    <script type="text/montage-serialization">
    {
        "owner": {
-            "module": "js/components/ui/file-input.reel",
+            "prototype": "js/components/ui/file-input.reel",
-            "name": "FileInput",
            "properties": {
                "element": {"#": "fileInput"},
                "inputField": {"#": "fileInputControl"},
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html
index fc197e8c..f2406566 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.html
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
    <script type="text/montage-serialization">
    {
        "owner":{
-                "module": "js/components/ui/icon-list-basic/iconsList.reel",
+                "prototype": "js/components/ui/icon-list-basic/iconsList.reel[Icon]",
-                "name":"Icon",
                "properties":{
                    "element": {"#" : "icon"},
                    "iconImg": {"#": "iconImg"},
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index 0bb79873..35260527 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,8 +11,7 @@
    <script type="text/montage-serialization">
    {
        "pickerIcon": {
-            "module" : "js/components/ui/icon-list-basic/icon.reel",
+            "prototype" : "js/components/ui/icon-list-basic/icon.reel",
-            "name": "Icon",
            "properties": {
                "element": {"#": "icon"}
            },
@@ -31,8 +30,7 @@
        },
        "repetition1" : {
-            "module": "montage/ui/repetition.reel",
+            "prototype": "montage/ui/repetition.reel",
-            "name": "Repetition",
            "properties": {
                "element": {"#": "iconsView"}
            },
@@ -47,8 +45,7 @@
        },
        "owner" : {
-            "module" : "js/components/ui/icon-list-basic/iconsList.reel",
+            "prototype" : "js/components/ui/icon-list-basic/iconsList.reel",
-            "name" : "IconsList",
            "properties" : {
                "element" : {"#": "list"},
                "components": [{"@": "repetition1"}]
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html
index 0050b8cb..4cdb4e69 100755
--- a/js/components/ui/input-group.reel/input-group.html
+++ b/js/components/ui/input-group.reel/input-group.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,16 +11,14 @@
    <script type="text/montage-serialization">
    {
        "eventDelegator": {
-                "module": "montage/core/event/action-event-listener",
+                "prototype": "montage/core/event/action-event-listener",
-                "name": "ActionEventListener",
                "properties": {
                    "handler": {"@": "owner"},
                    "action": "forwardEvent"
                }
            },
        "propControl1": {
-            "module": "js/components/ui/property-control.reel",
+            "prototype": "js/components/ui/property-control.reel",
-            "name": "PropertyControl",
            "properties": {
                "element": {"#": "inputPair"}
            },
@@ -44,8 +42,7 @@
                            ]
        },
        "propList": {
-            "module": "montage/ui/repetition.reel",
+            "prototype": "montage/ui/repetition.reel",
-            "name": "Repetition",
            "properties": {
                "element": {"#": "inputList"}
            },
@@ -58,8 +55,7 @@
            }
        },
        "owner": {
-            "module": "js/components/ui/input-group.reel",
+            "prototype": "js/components/ui/input-group.reel",
-            "name": "InputGroup",
            "properties": {
                "element": {"#": "inputRow"},
                "controlsList": {"@": "propList"}
diff --git a/js/components/ui/property-control.reel/property-control.html b/js/components/ui/property-control.reel/property-control.html
index 43e8e67f..d85cb0e3 100755
--- a/js/components/ui/property-control.reel/property-control.html
+++ b/js/components/ui/property-control.reel/property-control.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML>
+<!DOCTYPE HTML>
 <!-- <copyright>
 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -11,15 +11,13 @@
    <script type="text/montage-serialization">
    {
        "substitution1": {
-            "module": "montage/ui/substitution.reel",
+            "prototype": "montage/ui/substitution.reel",
-            "name": "Substitution",
            "properties": {
                "element": {"#": "propController"}
            }
        },
        "owner": {
-            "module": "js/components/ui/property-control.reel",
+            "prototype": "js/components/ui/property-control.reel",
-            "name": "PropertyControl",
            "properties": {
                "element": {"#": "propControl"},
                "labelField": {"#": "propLabel"},
diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html
index 1990a4ef..f0c51fcc 100755
--- a/js/components/ui/tree-basic/tree.reel/tree.html
+++ b/