diff --git a/ui (gen4)/imagegrid/data.js b/ui (gen4)/imagegrid/data.js
index 31d2665b..e8fcba7d 100755
--- a/ui (gen4)/imagegrid/data.js	
+++ b/ui (gen4)/imagegrid/data.js	
@@ -2951,7 +2951,7 @@ var DataPrototype = {
 
 var BaseData = 
 module.BaseData = 
-	object.makeConstructor('BaseData', 
+	object.Constructor('BaseData', 
 		DataClassPrototype, 
 		DataPrototype)
 
@@ -3250,7 +3250,7 @@ var DataWithTagsPrototype = {
 
 var DataWithTags = 
 module.DataWithTags = 
-	object.makeConstructor('DataWithTags', 
+	object.Constructor('DataWithTags', 
 		DataClassPrototype, 
 		DataWithTagsPrototype)
 
diff --git a/ui (gen4)/imagegrid/images.js b/ui (gen4)/imagegrid/images.js
index d570a6f0..1ceebb29 100755
--- a/ui (gen4)/imagegrid/images.js	
+++ b/ui (gen4)/imagegrid/images.js	
@@ -290,7 +290,7 @@ module.ImagePrototype = {
 
 var Image = 
 module.Image = 
-	object.makeConstructor('Image', 
+	object.Constructor('Image', 
 		ImageClassPrototype, 
 		ImagePrototype)
 
@@ -780,7 +780,7 @@ module.ImagesPrototype = {
 // Main Images object...
 var Images = 
 module.Images = 
-	object.makeConstructor('Images', 
+	object.Constructor('Images', 
 		ImagesClassPrototype, 
 		ImagesPrototype)
 
diff --git a/ui (gen4)/imagegrid/ribbons.js b/ui (gen4)/imagegrid/ribbons.js
index c08d167b..89fa15e7 100755
--- a/ui (gen4)/imagegrid/ribbons.js	
+++ b/ui (gen4)/imagegrid/ribbons.js	
@@ -996,7 +996,7 @@ var BaseRibbonsPrototype = {
 
 var BaseRibbons = 
 module.BaseRibbons = 
-	object.makeConstructor('BaseRibbons', 
+	object.Constructor('BaseRibbons', 
 		BaseRibbonsClassPrototype, 
 		BaseRibbonsPrototype)
 
@@ -2572,7 +2572,7 @@ RibbonsPrototype.__proto__ = BaseRibbonsPrototype
 
 var Ribbons = 
 module.Ribbons = 
-	object.makeConstructor('Ribbons', 
+	object.Constructor('Ribbons', 
 		RibbonsClassPrototype, 
 		RibbonsPrototype)
 
diff --git a/ui (gen4)/imagegrid/tags.js b/ui (gen4)/imagegrid/tags.js
index afaf2177..20af0fef 100755
--- a/ui (gen4)/imagegrid/tags.js	
+++ b/ui (gen4)/imagegrid/tags.js	
@@ -2114,7 +2114,7 @@ var BaseTagsPrototype = {
 
 var BaseTags = 
 module.BaseTags = 
-	object.makeConstructor('BaseTags', 
+	object.Constructor('BaseTags', 
 		BaseTagsClassPrototype, 
 		BaseTagsPrototype)
 
@@ -2267,7 +2267,7 @@ var TagsWithHandlersPrototype = {
 
 var TagsWithHandlers = 
 module.TagsWithHandlers = 
-	object.makeConstructor('TagsWithHandlers', 
+	object.Constructor('TagsWithHandlers', 
 		BaseTagsClassPrototype,
 		TagsWithHandlersPrototype)
 
@@ -2296,7 +2296,7 @@ var TagsWithPersistentPathsPrototype = {
 
 var TagsWithPersistentPaths = 
 module.TagsWithPersistentPaths = 
-	object.makeConstructor('TagsWithPersistentPaths', 
+	object.Constructor('TagsWithPersistentPaths', 
 		BaseTagsClassPrototype,
 		TagsWithPersistentPathsPrototype)
 
@@ -2521,7 +2521,7 @@ var TagsWithDictPrototype = {
 
 var TagsWithDict = 
 module.TagsWithDict = 
-	object.makeConstructor('TagsWithDict', 
+	object.Constructor('TagsWithDict', 
 		BaseTagsClassPrototype,
 		TagsWithDictPrototype)
 
@@ -2533,7 +2533,7 @@ var Tags =
 module.Tags = 
 	//TagsWithHandlers
 	//BaseTags
-	object.makeConstructor('Tags', 
+	object.Constructor('Tags', 
 		BaseTagsClassPrototype,
 		object.mixin(BaseTagsPrototype,
 			TagsWithHandlersPrototype,
diff --git a/ui (gen4)/lib/keyboard.js b/ui (gen4)/lib/keyboard.js
index 3a86129b..8e09f7fa 100755
--- a/ui (gen4)/lib/keyboard.js	
+++ b/ui (gen4)/lib/keyboard.js	
@@ -1089,7 +1089,7 @@ var KeyboardPrototype = {
 
 var Keyboard = 
 module.Keyboard = 
-object.makeConstructor('Keyboard', 
+object.Constructor('Keyboard', 
 		KeyboardClassPrototype, 
 		KeyboardPrototype)
 
@@ -1133,7 +1133,7 @@ var KeyboardWithCSSModesPrototype = {
 
 var KeyboardWithCSSModes = 
 module.KeyboardWithCSSModes = 
-object.makeConstructor('KeyboardWithCSSModes', 
+object.Constructor('KeyboardWithCSSModes', 
 		KeyboardClassPrototype, 
 		KeyboardWithCSSModesPrototype)
 // inherit from Keyboard...
diff --git a/ui (gen4)/lib/tasks.js b/ui (gen4)/lib/tasks.js
index 0e505fe8..2682beb0 100755
--- a/ui (gen4)/lib/tasks.js	
+++ b/ui (gen4)/lib/tasks.js	
@@ -372,7 +372,7 @@ module.QueueActions = actions.Actions(QueuePrototype, {
 
 var Queue = 
 module.Queue = 
-object.makeConstructor('Queue', QueueActions)
+object.Constructor('Queue', QueueActions)
 
 
 
diff --git a/ui (gen4)/lib/transform.js b/ui (gen4)/lib/transform.js
index 2b9c0108..fe3bd758 100755
--- a/ui (gen4)/lib/transform.js	
+++ b/ui (gen4)/lib/transform.js	
@@ -474,7 +474,7 @@ var transformEditor = function(){
 
 var TransformEditor = 
 module.TransformEditor =
-object.makeConstructor('TransformEditor', transformEditor())
+object.Constructor('TransformEditor', transformEditor())
 
 // XXX STUB: for testing only...
 window.transformEditor = TransformEditor
diff --git a/ui (gen4)/lib/widget/browse-walk.js b/ui (gen4)/lib/widget/browse-walk.js
index 4aab59ba..968522ef 100755
--- a/ui (gen4)/lib/widget/browse-walk.js	
+++ b/ui (gen4)/lib/widget/browse-walk.js	
@@ -351,7 +351,7 @@ var WalkPrototype = {
 
 var Walk = 
 module.Walk = 
-object.makeConstructor('Walk', 
+object.Constructor('Walk', 
 		browse.Browser, 
 		WalkPrototype)
 
diff --git a/ui (gen4)/lib/widget/browse.js b/ui (gen4)/lib/widget/browse.js
index 21f9ab48..d93168b5 100755
--- a/ui (gen4)/lib/widget/browse.js	
+++ b/ui (gen4)/lib/widget/browse.js	
@@ -4134,7 +4134,7 @@ var BrowserPrototype = {
 
 var Browser = 
 module.Browser = 
-object.makeConstructor('Browser', 
+object.Constructor('Browser', 
 		BrowserClassPrototype, 
 		BrowserPrototype)
 
@@ -4166,7 +4166,7 @@ ListerPrototype.options.__proto__ = Browser.prototype.options
 
 var Lister = 
 module.Lister = 
-object.makeConstructor('Lister', 
+object.Constructor('Lister', 
 		BrowserClassPrototype, 
 		ListerPrototype)
 
@@ -4246,7 +4246,7 @@ ListPrototype.options.__proto__ = Browser.prototype.options
 
 var List = 
 module.List = 
-object.makeConstructor('List', 
+object.Constructor('List', 
 		BrowserClassPrototype, 
 		ListPrototype)
 
@@ -4509,7 +4509,7 @@ PathListPrototype.options.__proto__ = Browser.prototype.options
 
 var PathList = 
 module.PathList = 
-object.makeConstructor('PathList', 
+object.Constructor('PathList', 
 		BrowserClassPrototype, 
 		PathListPrototype)
 
diff --git a/ui (gen4)/lib/widget/browse2.js b/ui (gen4)/lib/widget/browse2.js
index 66747aed..a166bce4 100755
--- a/ui (gen4)/lib/widget/browse2.js	
+++ b/ui (gen4)/lib/widget/browse2.js	
@@ -458,7 +458,7 @@ object.mixinFlat(function(){}, {
 
 var Make = 
 module.Make = 
-object.makeConstructor('Make', Items)
+object.Constructor('Make', Items)
 
 
 
@@ -522,7 +522,7 @@ var BaseItemPrototype = {
 
 var BaseItem = 
 module.BaseItem = 
-object.makeConstructor('BaseItem', 
+object.Constructor('BaseItem', 
 	BaseItemClassPrototype,
 	BaseItemPrototype)
 
@@ -749,7 +749,7 @@ function(options){
 //
 var BrowserEvent =
 module.BrowserEvent = 
-object.makeConstructor('BrowserEvent', 
+object.Constructor('BrowserEvent', 
 {
 	// event name...
 	name: undefined,
@@ -3837,7 +3837,7 @@ var BaseBrowserPrototype = {
 
 var BaseBrowser = 
 module.BaseBrowser = 
-object.makeConstructor('BaseBrowser', 
+object.Constructor('BaseBrowser', 
 		BaseBrowserClassPrototype, 
 		BaseBrowserPrototype)
 
@@ -3983,7 +3983,7 @@ var HTMLItemPrototype = {
 
 var HTMLItem = 
 module.HTMLItem = 
-object.makeConstructor('HTMLItem', 
+object.Constructor('HTMLItem', 
 	HTMLItemClassPrototype,
 	HTMLItemPrototype)
 
@@ -5199,7 +5199,7 @@ var HTMLBrowserPrototype = {
 // XXX should this be a Widget too???
 var HTMLBrowser = 
 module.HTMLBrowser = 
-object.makeConstructor('HTMLBrowser', 
+object.Constructor('HTMLBrowser', 
 		HTMLBrowserClassPrototype, 
 		HTMLBrowserPrototype)
 
@@ -5264,7 +5264,7 @@ var TextBrowserPrototype = {
 
 var TextBrowser = 
 module.TextBrowser = 
-object.makeConstructor('TextBrowser', 
+object.Constructor('TextBrowser', 
 		TextBrowserClassPrototype, 
 		TextBrowserPrototype)
 
diff --git a/ui (gen4)/lib/widget/drawer.js b/ui (gen4)/lib/widget/drawer.js
index 8556ad9b..7ef8847b 100755
--- a/ui (gen4)/lib/widget/drawer.js	
+++ b/ui (gen4)/lib/widget/drawer.js	
@@ -193,7 +193,7 @@ var DrawerPrototype = {
 
 var Drawer = 
 module.Drawer = 
-object.makeConstructor('Drawer', 
+object.Constructor('Drawer', 
 		DrawerClassPrototype, 
 		DrawerPrototype)
 
diff --git a/ui (gen4)/lib/widget/overlay.js b/ui (gen4)/lib/widget/overlay.js
index f2d57186..4b603e55 100755
--- a/ui (gen4)/lib/widget/overlay.js	
+++ b/ui (gen4)/lib/widget/overlay.js	
@@ -138,7 +138,7 @@ var OverlayPrototype = {
 
 var Overlay = 
 module.Overlay = 
-object.makeConstructor('Overlay', 
+object.Constructor('Overlay', 
 		OverlayClassPrototype, 
 		OverlayPrototype)
 
diff --git a/ui (gen4)/lib/widget/widget.js b/ui (gen4)/lib/widget/widget.js
index 3d584f4d..329cc630 100755
--- a/ui (gen4)/lib/widget/widget.js	
+++ b/ui (gen4)/lib/widget/widget.js	
@@ -208,7 +208,7 @@ var WidgetPrototype = {
 
 var Widget = 
 module.Widget = 
-object.makeConstructor('Widget', 
+object.Constructor('Widget', 
 		WidgetClassPrototype, 
 		WidgetPrototype)
 
@@ -290,7 +290,7 @@ var ContainerPrototype = {
 
 var Container = 
 module.Container = 
-object.makeConstructor('Container', 
+object.Constructor('Container', 
 		ContainerClassPrototype, 
 		ContainerPrototype)