diff --git a/js/id/behavior/lasso.js b/js/id/behavior/lasso.js
index 0a26f311d..6196cbf2e 100644
--- a/js/id/behavior/lasso.js
+++ b/js/id/behavior/lasso.js
@@ -12,7 +12,7 @@ iD.behavior.Lasso = function(context) {
 
                 pos = [d3.event.clientX, d3.event.clientY];
 
-                lasso = iD.ui.lasso().a(d3.mouse(context.surface().node()));
+                lasso = iD.ui.Lasso().a(d3.mouse(context.surface().node()));
 
                 context.surface().call(lasso);
 
diff --git a/js/id/modes/select.js b/js/id/modes/select.js
index ad1571d20..ac6ad4943 100644
--- a/js/id/modes/select.js
+++ b/js/id/modes/select.js
@@ -4,7 +4,7 @@ iD.modes.Select = function(context, selection, initial) {
         button: 'browse'
     };
 
-    var inspector = iD.ui.inspector().initial(!!initial),
+    var inspector = iD.ui.Inspector().initial(!!initial),
         keybinding = d3.keybinding('select'),
         timeout = null,
         behaviors = [
diff --git a/js/id/ui.js b/js/id/ui.js
index e1daad3a1..48e5682bf 100644
--- a/js/id/ui.js
+++ b/js/id/ui.js
@@ -47,7 +47,7 @@ iD.ui = function(context) {
 
         container.append('div')
             .attr('class', 'map-control layerswitcher-control')
-            .call(iD.ui.layerswitcher(context));
+            .call(iD.ui.LayerSwitcher(context));
 
         container.append('div')
             .attr('class', 'map-control geolocate-control')
@@ -103,7 +103,7 @@ iD.ui = function(context) {
 
         linkList.append('li')
             .attr('id', 'user-list')
-            .call(iD.ui.contributors(context));
+            .call(iD.ui.Contributors(context));
 
         window.onbeforeunload = function() {
             history.save();
@@ -142,7 +142,7 @@ iD.ui = function(context) {
             map.centerZoom([-77.02271, 38.90085], 20);
         }
 
-        userContainer.call(iD.ui.userpanel(connection)
+        userContainer.call(iD.ui.UserPanel(connection)
             .on('logout.editor', connection.logout)
             .on('login.editor', connection.authenticate));
 
diff --git a/js/id/ui/commit.js b/js/id/ui/commit.js
index 8d724a732..6708ece49 100644
--- a/js/id/ui/commit.js
+++ b/js/id/ui/commit.js
@@ -1,4 +1,4 @@
-iD.ui.commit = function(context) {
+iD.ui.Commit = function(context) {
     var event = d3.dispatch('cancel', 'save', 'fix');
 
     function zipSame(d) {
diff --git a/js/id/ui/contributors.js b/js/id/ui/contributors.js
index 596c576ad..2389f266a 100644
--- a/js/id/ui/contributors.js
+++ b/js/id/ui/contributors.js
@@ -1,4 +1,4 @@
-iD.ui.contributors = function(context) {
+iD.ui.Contributors = function(context) {
     function update(selection) {
         var users = {},
             limit = 3,
diff --git a/js/id/ui/geocoder.js b/js/id/ui/geocoder.js
index d0479e61d..cc0ce205c 100644
--- a/js/id/ui/geocoder.js
+++ b/js/id/ui/geocoder.js
@@ -64,7 +64,7 @@ iD.ui.Geocoder = function(context) {
         function setVisible(show) {
             if (show !== shown) {
                 button.classed('active', show);
-                gcForm.call(iD.ui.toggle(show));
+                gcForm.call(iD.ui.Toggle(show));
                 if (!show) resultsList.classed('hide', !show);
                 if (show) inputNode.node().focus();
                 else inputNode.node().blur();
diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 836f73cff..173594101 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -1,4 +1,4 @@
-iD.ui.inspector = function() {
+iD.ui.Inspector = function() {
     var event = d3.dispatch('changeTags', 'close'),
         taginfo = iD.taginfo(),
         initial = false,
@@ -43,7 +43,7 @@ iD.ui.inspector = function() {
             .attr('class', 'inspector-buttons pad1 fillD')
             .call(drawButtons);
 
-        inspector.call(iD.ui.toggle(true));
+        inspector.call(iD.ui.Toggle(true));
     }
 
     function drawHead(selection) {
diff --git a/js/id/ui/lasso.js b/js/id/ui/lasso.js
index 511df2a7e..4644364c3 100644
--- a/js/id/ui/lasso.js
+++ b/js/id/ui/lasso.js
@@ -1,4 +1,4 @@
-iD.ui.lasso = function() {
+iD.ui.Lasso = function() {
 
     var center, box,
         group,
@@ -13,7 +13,7 @@ iD.ui.lasso = function() {
         box = group.append('rect')
             .attr('class', 'lasso-box');
 
-        group.call(iD.ui.toggle(true));
+        group.call(iD.ui.Toggle(true));
 
     }
 
@@ -50,7 +50,7 @@ iD.ui.lasso = function() {
 
     lasso.close = function(selection) {
         if (group) {
-            group.call(iD.ui.toggle(false, function() {
+            group.call(iD.ui.Toggle(false, function() {
                 d3.select(this).remove();
             }));
         }
diff --git a/js/id/ui/layerswitcher.js b/js/id/ui/layerswitcher.js
index 60fd674e0..6724715e0 100644
--- a/js/id/ui/layerswitcher.js
+++ b/js/id/ui/layerswitcher.js
@@ -1,4 +1,4 @@
-iD.ui.layerswitcher = function(context) {
+iD.ui.LayerSwitcher = function(context) {
     var event = d3.dispatch('cancel', 'save'),
         opacities = [1, 0.5, 0];
 
@@ -36,7 +36,7 @@ iD.ui.layerswitcher = function(context) {
         function setVisible(show) {
             if (show !== shown) {
                 button.classed('active', show);
-                content.call(iD.ui.toggle(show));
+                content.call(iD.ui.Toggle(show));
                 shown = show;
             }
         }
diff --git a/js/id/ui/save.js b/js/id/ui/save.js
index b8f9d619a..b4eed1dd0 100644
--- a/js/id/ui/save.js
+++ b/js/id/ui/save.js
@@ -17,7 +17,7 @@ iD.ui.Save = function(context) {
             modal.select('.content')
                 .classed('commit-modal', true)
                 .datum(changes)
-                .call(iD.ui.commit(context)
+                .call(iD.ui.Commit(context)
                     .on('cancel', function() {
                         modal.remove();
                     })
@@ -60,7 +60,7 @@ iD.ui.Save = function(context) {
                 id: changeset_id,
                 comment: e.comment
             })
-            .call(iD.ui.success(connection)
+            .call(iD.ui.Success(connection)
                 .on('cancel', function() {
                     modal.remove();
                 }));
diff --git a/js/id/ui/success.js b/js/id/ui/success.js
index fffa7b6ab..17a577fb3 100644
--- a/js/id/ui/success.js
+++ b/js/id/ui/success.js
@@ -1,4 +1,4 @@
-iD.ui.success = function(connection) {
+iD.ui.Success = function(connection) {
     var event = d3.dispatch('cancel', 'save');
 
     function success(selection) {
diff --git a/js/id/ui/toggle.js b/js/id/ui/toggle.js
index 3a7500023..c3c299905 100644
--- a/js/id/ui/toggle.js
+++ b/js/id/ui/toggle.js
@@ -2,7 +2,7 @@
 // hide class, which sets display=none, and a d3 transition for opacity.
 // this will cause blinking when called repeatedly, so check that the
 // value actually changes between calls.
-iD.ui.toggle = function(show, callback) {
+iD.ui.Toggle = function(show, callback) {
     return function(selection) {
         selection.style('opacity', show ? 0 : 1)
             .classed('hide', false)
diff --git a/js/id/ui/userpanel.js b/js/id/ui/userpanel.js
index fda2fc463..3dab2a5bd 100644
--- a/js/id/ui/userpanel.js
+++ b/js/id/ui/userpanel.js
@@ -1,4 +1,4 @@
-iD.ui.userpanel = function(connection) {
+iD.ui.UserPanel = function(connection) {
     var event = d3.dispatch('logout', 'login');
 
     function user(selection) {
diff --git a/test/spec/ui/inspector.js b/test/spec/ui/inspector.js
index e92604a7a..17160ddb4 100644
--- a/test/spec/ui/inspector.js
+++ b/test/spec/ui/inspector.js
@@ -1,10 +1,10 @@
-describe("iD.ui.inspector", function () {
+describe("iD.ui.Inspector", function () {
     var inspector, element,
         tags = {highway: 'residential'},
         entity, graph, context;
 
     function render() {
-        inspector = iD.ui.inspector().context(context);
+        inspector = iD.ui.Inspector().context(context);
         element = d3.select('body')
             .append('div')
             .attr('id', 'inspector-wrap')