diff --git a/sky/examples/raw/ink_well.dart b/sky/examples/raw/ink_well.dart
index ebdee70..d2ff9f8 100644
--- a/sky/examples/raw/ink_well.dart
+++ b/sky/examples/raw/ink_well.dart
@@ -4,8 +4,8 @@
 
 import 'dart:sky' as sky;
 import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/render_box.dart';
-import 'package:sky/framework/rendering/render_node.dart';
+import 'package:sky/framework/rendering/box.dart';
+import 'package:sky/framework/rendering/node.dart';
 import 'package:sky/framework/animation/animated_value.dart';
 import 'package:sky/framework/animation/curves.dart';
 
diff --git a/sky/examples/raw/render_paragraph.dart b/sky/examples/raw/render_paragraph.dart
index 519ce32..24cb1d5 100644
--- a/sky/examples/raw/render_paragraph.dart
+++ b/sky/examples/raw/render_paragraph.dart
@@ -4,10 +4,10 @@
 
 import 'dart:sky';
 import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/render_box.dart';
-import 'package:sky/framework/rendering/render_node.dart';
-import 'package:sky/framework/rendering/render_flex.dart';
-import 'package:sky/framework/rendering/render_paragraph.dart';
+import 'package:sky/framework/rendering/box.dart';
+import 'package:sky/framework/rendering/node.dart';
+import 'package:sky/framework/rendering/flex.dart';
+import 'package:sky/framework/rendering/paragraph.dart';
 
 class RenderSolidColor extends RenderDecoratedBox {
   final Size desiredSize;
diff --git a/sky/examples/raw/sector_layout.dart b/sky/examples/raw/sector_layout.dart
index 9e998a3..968c4f5 100644
--- a/sky/examples/raw/sector_layout.dart
+++ b/sky/examples/raw/sector_layout.dart
@@ -5,8 +5,8 @@
 import 'dart:math' as math;
 import 'dart:sky' as sky;
 import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/render_box.dart';
-import 'package:sky/framework/rendering/render_node.dart';
+import 'package:sky/framework/rendering/box.dart';
+import 'package:sky/framework/rendering/node.dart';
 
 const double kTwoPi = 2 * math.PI;
 
diff --git a/sky/examples/raw/touch_demo.dart b/sky/examples/raw/touch_demo.dart
index 1eac7fa..f4c5659 100644
--- a/sky/examples/raw/touch_demo.dart
+++ b/sky/examples/raw/touch_demo.dart
@@ -5,8 +5,8 @@
 import 'dart:math';
 import 'dart:sky';
 import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/render_box.dart';
-import 'package:sky/framework/rendering/render_node.dart';
+import 'package:sky/framework/rendering/box.dart';
+import 'package:sky/framework/rendering/node.dart';
 
 // Material design colors. :p
 List<int> colors = [
diff --git a/sky/sdk/BUILD.gn b/sky/sdk/BUILD.gn
index a0de9f5..760a1b2 100644
--- a/sky/sdk/BUILD.gn
+++ b/sky/sdk/BUILD.gn
@@ -96,11 +96,11 @@
     "lib/framework/net/image_cache.dart",
     "lib/framework/node.dart",
     "lib/framework/reflect.dart",
-    "lib/framework/rendering/render_block.dart",
-    "lib/framework/rendering/render_box.dart",
-    "lib/framework/rendering/render_flex.dart",
-    "lib/framework/rendering/render_node.dart",
-    "lib/framework/rendering/render_paragraph.dart",
+    "lib/framework/rendering/block.dart",
+    "lib/framework/rendering/box.dart",
+    "lib/framework/rendering/flex.dart",
+    "lib/framework/rendering/node.dart",
+    "lib/framework/rendering/paragraph.dart",
     "lib/framework/scheduler.dart",
     "lib/framework/shell.dart",
     "lib/framework/theme/colors.dart",
diff --git a/sky/sdk/lib/framework/app.dart b/sky/sdk/lib/framework/app.dart
index 89b5fed..62b76d8 100644
--- a/sky/sdk/lib/framework/app.dart
+++ b/sky/sdk/lib/framework/app.dart
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:sky' as sky;
-import 'rendering/render_box.dart';
-import 'rendering/render_node.dart';
+import 'rendering/box.dart';
+import 'rendering/node.dart';
 import 'scheduler.dart' as scheduler;
 
 class AppView {
diff --git a/sky/sdk/lib/framework/components2/icon_button.dart b/sky/sdk/lib/framework/components2/icon_button.dart
index 8eab14a..765f75b 100644
--- a/sky/sdk/lib/framework/components2/icon_button.dart
+++ b/sky/sdk/lib/framework/components2/icon_button.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import '../fn2.dart';
+import '../rendering/box.dart';
 import 'icon.dart';
 
 class IconButton extends Component {
diff --git a/sky/sdk/lib/framework/components2/scaffold.dart b/sky/sdk/lib/framework/components2/scaffold.dart
index 79b641b..b1f992c 100644
--- a/sky/sdk/lib/framework/components2/scaffold.dart
+++ b/sky/sdk/lib/framework/components2/scaffold.dart
@@ -5,8 +5,8 @@
 import '../fn2.dart';
 import '../theme/typography.dart' as typography;
 import 'dart:sky' as sky;
-import '../rendering/render_box.dart';
-import '../rendering/render_node.dart';
+import '../rendering/box.dart';
+import '../rendering/node.dart';
 
 // RenderNode
 class RenderScaffold extends RenderBox {
diff --git a/sky/sdk/lib/framework/fn2.dart b/sky/sdk/lib/framework/fn2.dart
index 9a4538b..e4fbb47 100644
--- a/sky/sdk/lib/framework/fn2.dart
+++ b/sky/sdk/lib/framework/fn2.dart
@@ -10,11 +10,11 @@
 import 'dart:sky' as sky;
 import 'reflect.dart' as reflect;
 import 'app.dart';
-import 'rendering/render_block.dart';
-import 'rendering/render_box.dart';
-import 'rendering/render_flex.dart';
-import 'rendering/render_node.dart';
-import 'rendering/render_paragraph.dart';
+import 'rendering/block.dart';
+import 'rendering/box.dart';
+import 'rendering/flex.dart';
+import 'rendering/node.dart';
+import 'rendering/paragraph.dart';
 
 // final sky.Tracing _tracing = sky.window.tracing;
 
diff --git a/sky/sdk/lib/framework/rendering/render_block.dart b/sky/sdk/lib/framework/rendering/block.dart
similarity index 97%
rename from sky/sdk/lib/framework/rendering/render_block.dart
rename to sky/sdk/lib/framework/rendering/block.dart
index 065e211..8bc5393 100644
--- a/sky/sdk/lib/framework/rendering/render_block.dart
+++ b/sky/sdk/lib/framework/rendering/block.dart
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:sky' as sky;
-import 'render_box.dart';
-import 'render_node.dart';
+import 'box.dart';
+import 'node.dart';
 
 class BlockParentData extends BoxParentData with ContainerParentDataMixin<RenderBox> { }
 
diff --git a/sky/sdk/lib/framework/rendering/render_box.dart b/sky/sdk/lib/framework/rendering/box.dart
similarity index 99%
rename from sky/sdk/lib/framework/rendering/render_box.dart
rename to sky/sdk/lib/framework/rendering/box.dart
index dc081e1..57ad99c 100644
--- a/sky/sdk/lib/framework/rendering/render_box.dart
+++ b/sky/sdk/lib/framework/rendering/box.dart
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'render_node.dart';
+import 'node.dart';
 import 'dart:sky' as sky;
 
 // GENERIC BOX RENDERING
diff --git a/sky/sdk/lib/framework/rendering/render_flex.dart b/sky/sdk/lib/framework/rendering/flex.dart
similarity index 98%
rename from sky/sdk/lib/framework/rendering/render_flex.dart
rename to sky/sdk/lib/framework/rendering/flex.dart
index 5ef24fd..385c0cb 100644
--- a/sky/sdk/lib/framework/rendering/render_flex.dart
+++ b/sky/sdk/lib/framework/rendering/flex.dart
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:sky' as sky;
-import 'render_box.dart';
-import 'render_node.dart';
+import 'box.dart';
+import 'node.dart';
 
 class FlexBoxParentData extends BoxParentData with ContainerParentDataMixin<RenderBox> {
   int flex;
diff --git a/sky/sdk/lib/framework/rendering/render_node.dart b/sky/sdk/lib/framework/rendering/node.dart
similarity index 100%
rename from sky/sdk/lib/framework/rendering/render_node.dart
rename to sky/sdk/lib/framework/rendering/node.dart
diff --git a/sky/sdk/lib/framework/rendering/render_paragraph.dart b/sky/sdk/lib/framework/rendering/paragraph.dart
similarity index 96%
rename from sky/sdk/lib/framework/rendering/render_paragraph.dart
rename to sky/sdk/lib/framework/rendering/paragraph.dart
index 6580f84..da95ce4 100644
--- a/sky/sdk/lib/framework/rendering/render_paragraph.dart
+++ b/sky/sdk/lib/framework/rendering/paragraph.dart
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'dart:sky' as sky;
-import 'render_box.dart';
-import 'render_node.dart';
+import 'box.dart';
+import 'node.dart';
 
 class RenderInline extends RenderNode {
   String data;
diff --git a/sky/tests/raw/render_box.dart b/sky/tests/raw/render_box.dart
index c2a0685..bf44896 100644
--- a/sky/tests/raw/render_box.dart
+++ b/sky/tests/raw/render_box.dart
@@ -6,7 +6,7 @@
 import '../resources/unit.dart';
 import '../resources/display_list.dart';
 import 'dart:sky' as sky;
-import 'package:sky/framework/rendering/render_box.dart';
+import 'package:sky/framework/rendering/box.dart';
 
 void main() {
   initUnit();
diff --git a/sky/tests/raw/render_flex.dart b/sky/tests/raw/render_flex.dart
index 5a019fe..60d0cb8 100644
--- a/sky/tests/raw/render_flex.dart
+++ b/sky/tests/raw/render_flex.dart
@@ -7,9 +7,9 @@
 import '../resources/display_list.dart';
 import 'dart:sky' as sky;
 import 'package:sky/framework/app.dart';
-import 'package:sky/framework/rendering/render_block.dart';
-import 'package:sky/framework/rendering/render_box.dart';
-import 'package:sky/framework/rendering/render_flex.dart';
+import 'package:sky/framework/rendering/block.dart';
+import 'package:sky/framework/rendering/box.dart';
+import 'package:sky/framework/rendering/flex.dart';
 
 class RenderSolidColor extends RenderDecoratedBox {
   final sky.Size desiredSize;
diff --git a/sky/tests/resources/display_list.dart b/sky/tests/resources/display_list.dart
index 3f4ae2b..070af59 100644
--- a/sky/tests/resources/display_list.dart
+++ b/sky/tests/resources/display_list.dart
@@ -1,6 +1,6 @@
 
-import 'package:sky/framework/rendering/render_node.dart';
-import 'package:sky/framework/rendering/render_box.dart';
+import 'package:sky/framework/rendering/node.dart';
+import 'package:sky/framework/rendering/box.dart';
 import 'dart:sky' as sky;
 
 typedef void Logger (String s);