Shorter names to match hierarchy.

d3.js

@@ -6939,57 +6939,6 @@ d3 = function() {
     return arguments.length ? d3_transitionInheritId ? selection.transition() : selection : d3_selectionRoot.transition();
   };
   d3.transition.prototype = d3_transitionPrototype;
-  function d3_transitionNode(node, i, id, inherit) {
-    var lock = node.__transition__ || (node.__transition__ = {
-      active: 0,
-      count: 0
-    }), transition = lock[id];
-    if (!transition) {
-      var time = inherit.time;
-      transition = lock[id] = {
-        tween: new d3_Map(),
-        event: d3.dispatch("start", "end"),
-        time: time,
-        ease: inherit.ease,
-        delay: inherit.delay,
-        duration: inherit.duration
-      };
-      ++lock.count;
-      d3.timer(function(elapsed) {
-        var d = node.__data__, ease = transition.ease, event = transition.event, delay = transition.delay, duration = transition.duration, tweened = [];
-        return delay <= elapsed ? start(elapsed) : d3.timer(start, delay, time), 1;
-        function start(elapsed) {
-          if (lock.active > id) return stop();
-          lock.active = id;
-          event.start.call(node, d, i);
-          transition.tween.forEach(function(key, value) {
-            if (value = value.call(node, d, i)) {
-              tweened.push(value);
-            }
-          });
-          if (!tick(elapsed)) d3.timer(tick, 0, time);
-          return 1;
-        }
-        function tick(elapsed) {
-          if (lock.active !== id) return stop();
-          var t = (elapsed - delay) / duration, e = ease(t), n = tweened.length;
-          while (n > 0) {
-            tweened[--n].call(node, e);
-          }
-          if (t >= 1) {
-            stop();
-            event.end.call(node, d, i);
-            return 1;
-          }
-        }
-        function stop() {
-          if (--lock.count) delete lock[id]; else delete node.__transition__;
-          return 1;
-        }
-      }, 0, time);
-      return transition;
-    }
-  }
   d3_transitionPrototype.select = function(selector) {
     var id = this.id, subgroups = [], subgroup, subnode, node;
     if (typeof selector !== "function") selector = d3_selection_selector(selector);
@@ -7204,6 +7153,57 @@ d3 = function() {
     }
     return d3_transition(subgroups, id1);
   };
+  function d3_transitionNode(node, i, id, inherit) {
+    var lock = node.__transition__ || (node.__transition__ = {
+      active: 0,
+      count: 0
+    }), transition = lock[id];
+    if (!transition) {
+      var time = inherit.time;
+      transition = lock[id] = {
+        tween: new d3_Map(),
+        event: d3.dispatch("start", "end"),
+        time: time,
+        ease: inherit.ease,
+        delay: inherit.delay,
+        duration: inherit.duration
+      };
+      ++lock.count;
+      d3.timer(function(elapsed) {
+        var d = node.__data__, ease = transition.ease, event = transition.event, delay = transition.delay, duration = transition.duration, tweened = [];
+        return delay <= elapsed ? start(elapsed) : d3.timer(start, delay, time), 1;
+        function start(elapsed) {
+          if (lock.active > id) return stop();
+          lock.active = id;
+          event.start.call(node, d, i);
+          transition.tween.forEach(function(key, value) {
+            if (value = value.call(node, d, i)) {
+              tweened.push(value);
+            }
+          });
+          if (!tick(elapsed)) d3.timer(tick, 0, time);
+          return 1;
+        }
+        function tick(elapsed) {
+          if (lock.active !== id) return stop();
+          var t = (elapsed - delay) / duration, e = ease(t), n = tweened.length;
+          while (n > 0) {
+            tweened[--n].call(node, e);
+          }
+          if (t >= 1) {
+            stop();
+            event.end.call(node, d, i);
+            return 1;
+          }
+        }
+        function stop() {
+          if (--lock.count) delete lock[id]; else delete node.__transition__;
+          return 1;
+        }
+      }, 0, time);
+      return transition;
+    }
+  }
   d3.svg.axis = function() {
     var scale = d3.scale.linear(), orient = d3_svg_axisDefaultOrient, tickMajorSize = 6, tickMinorSize = 6, tickEndSize = 6, tickPadding = 3, tickArguments_ = [ 10 ], tickValues = null, tickFormat_, tickSubdivide = 0;
     function axis(g) {

src/selection/enter-select.js

@@ -1,5 +1,5 @@
 import "selection";
-import "selection-enter";
+import "enter";
 
 d3_selection_enterPrototype.select = function(selector) {
   var subgroups = [],

src/selection/enter.js

@@ -16,4 +16,4 @@ d3_selection_enterPrototype.insert = d3_selectionPrototype.insert;
 d3_selection_enterPrototype.empty = d3_selectionPrototype.empty;
 d3_selection_enterPrototype.node = d3_selectionPrototype.node;
 
-import "selection-enter-select";
+import "enter-select";

src/selection/selection.js

@@ -27,28 +27,28 @@ d3.selection = function() {
 
 d3.selection.prototype = d3_selectionPrototype;
 
-import "selection-select";
-import "selection-selectAll";
-import "selection-attr";
-import "selection-classed";
-import "selection-style";
-import "selection-property";
-import "selection-text";
-import "selection-html";
-import "selection-append";
-import "selection-insert";
-import "selection-remove";
-import "selection-data";
-import "selection-datum";
-import "selection-filter";
-import "selection-order";
-import "selection-sort";
-import "selection-on";
-import "selection-each";
-import "selection-call";
-import "selection-empty";
-import "selection-node";
-import "selection-enter";
+import "select";
+import "selectAll";
+import "attr";
+import "classed";
+import "style";
+import "property";
+import "text";
+import "html";
+import "append";
+import "insert";
+import "remove";
+import "data";
+import "datum";
+import "filter";
+import "order";
+import "sort";
+import "on";
+import "each";
+import "call";
+import "empty";
+import "node";
+import "enter";
 
 var d3_selectionRoot = d3_selection([[d3_document]]);
 

src/transition/attr.js

@@ -1,7 +1,7 @@
 import "../interpolate/interpolate";
 import "../selection/ns";
 import "transition";
-import "transition-tween";
+import "tween";
 
 d3_transitionPrototype.attr = function(nameNS, value) {
   if (arguments.length < 2) {

src/transition/delay.js

@@ -1,4 +1,4 @@
-import "../selection/selection-each";
+import "../selection/each";
 import "transition";
 
 d3_transitionPrototype.delay = function(value) {

src/transition/duration.js

@@ -1,4 +1,4 @@
-import "../selection/selection-each";
+import "../selection/each";
 import "transition";
 
 d3_transitionPrototype.duration = function(value) {

src/transition/each.js

@@ -1,4 +1,4 @@
-import "../selection/selection-each";
+import "../selection/each";
 import "transition";
 
 d3_transitionPrototype.each = function(type, listener) {

src/transition/ease.js

@@ -1,5 +1,5 @@
 import "../interpolate/ease";
-import "../selection/selection-each";
+import "../selection/each";
 import "transition";
 
 d3_transitionPrototype.ease = function(value) {

src/transition/filter.js

@@ -1,4 +1,4 @@
-import "../selection/selection-filter";
+import "../selection/filter";
 import "transition";
 
 d3_transitionPrototype.filter = function(filter) {

src/transition/index.js

@@ -1,15 +1,2 @@
-import "../selection/selection-transition";
+import "../selection/transition";
 import "transition";
-import "transition-select";
-import "transition-selectAll";
-import "transition-filter";
-import "transition-attr";
-import "transition-style";
-import "transition-text";
-import "transition-remove";
-import "transition-ease";
-import "transition-delay";
-import "transition-duration";
-import "transition-each";
-import "transition-transition";
-import "transition-tween";

src/transition/select.js

@@ -1,4 +1,4 @@
-import "../selection/selection-select";
+import "../selection/select";
 import "transition";
 
 d3_transitionPrototype.select = function(selector) {

src/transition/selectAll.js

@@ -1,4 +1,4 @@
-import "../selection/selection-select";
+import "../selection/select";
 import "transition";
 
 d3_transitionPrototype.selectAll = function(selector) {

src/transition/style.js

@@ -1,7 +1,7 @@
 import "../core/document";
 import "../interpolate/interpolate";
 import "transition";
-import "transition-tween";
+import "tween";
 
 d3_transitionPrototype.style = function(name, value, priority) {
   var n = arguments.length;

src/transition/text.js

@@ -1,5 +1,5 @@
 import "transition";
-import "transition-tween";
+import "tween";
 
 d3_transitionPrototype.text = function(value) {
   return d3_transition_tween(this, "text", value, d3_transition_text);

src/transition/transition.js

@@ -30,6 +30,20 @@ d3.transition = function(selection) {
 
 d3.transition.prototype = d3_transitionPrototype;
 
+import "select";
+import "selectAll";
+import "filter";
+import "attr";
+import "style";
+import "text";
+import "remove";
+import "ease";
+import "delay";
+import "duration";
+import "each";
+import "subtransition";
+import "tween";
+
 function d3_transitionNode(node, i, id, inherit) {
   var lock = node.__transition__ || (node.__transition__ = {active: 0, count: 0}),
       transition = lock[id];

src/transition/tween.js

@@ -1,4 +1,4 @@
-import "../selection/selection-each";
+import "../selection/each";
 import "transition";
 
 d3_transitionPrototype.tween = function(name, tween) {