diff --git a/lib/js/BUCK b/lib/js/BUCK
index 924f7b8f68..3492630abf 100644
--- a/lib/js/BUCK
+++ b/lib/js/BUCK
@@ -68,9 +68,17 @@ npm_binary(
 # Use the same procedure as for adding dependencies, except just change the
 # version number of the existing bower_component rather than adding a new rule.
 
+bower_component(
+  name = 'font-roboto',
+  package = 'polymerelements/font-roboto',
+  version = '1.0.1',
+  license = 'polymer',
+  sha1 = '735676217f67221903d6be10cc2fb1b336bed13f',
+)
+
 bower_component(
   name = 'iron-a11y-keys-behavior',
-  package = 'PolymerElements/iron-a11y-keys-behavior',
+  package = 'polymerelements/iron-a11y-keys-behavior',
   version = '1.1.0',
   deps = [':polymer'],
   license = 'polymer',
@@ -89,15 +97,28 @@ bower_component(
   sha1 = 'f94a3a3d847842c49def41e27da42c7c94f8d7c7',
 )
 
+bower_component(
+  name = 'iron-behaviors',
+  package = 'polymerelements/iron-behaviors',
+  version = '1.0.11',
+  deps = [
+    ':iron-a11y-keys-behavior',
+    ':polymer',
+  ],
+  license = 'polymer',
+  sha1 = 'e0fcfcd8696381fc78ff62261ba333e5e133f39d',
+)
+
 bower_component(
   name = 'iron-dropdown',
   package = 'polymerelements/iron-dropdown',
   version = '1.0.6',
   deps = [
-    ':neon-animation',
+    ':iron-a11y-keys-behavior',
     ':iron-behaviors',
     ':iron-overlay-behavior',
     ':iron-resizable-behavior',
+    ':neon-animation',
     ':polymer',
   ],
   license = 'polymer',
@@ -105,12 +126,21 @@ bower_component(
 )
 
 bower_component(
-  name = 'iron-resizable-behavior',
-  package = 'polymerelements/iron-resizable-behavior',
-  version = '1.0.2',
+  name = 'iron-fit-behavior',
+  package = 'polymerelements/iron-fit-behavior',
+  version = '1.0.5',
   deps = [':polymer'],
   license = 'polymer',
-  sha1 = '954e82c70b5412d20e7b4d65195a844bb6dc9a07',
+  sha1 = 'c0273d22531451a1e64f447971ad16b357a7f7e0',
+)
+
+bower_component(
+  name = 'iron-flex-layout',
+  package = 'polymerelements/iron-flex-layout',
+  version = '1.2.2',
+  deps = [':polymer'],
+  license = 'polymer',
+  sha1 = '3ca2fbbf3b56d95677663f78304262dee68753c3',
 )
 
 bower_component(
@@ -126,15 +156,12 @@ bower_component(
 )
 
 bower_component(
-  name = 'iron-behaviors',
-  package = 'polymerelements/iron-behaviors',
-  version = '1.0.11',
-  deps = [
-    ':iron-a11y-keys-behavior',
-    ':polymer',
-  ],
+  name = 'iron-meta',
+  package = 'polymerelements/iron-meta',
+  version = '1.1.1',
+  deps = [':polymer'],
   license = 'polymer',
-  sha1 = 'e0fcfcd8696381fc78ff62261ba333e5e133f39d',
+  sha1 = 'e06281b6ddb3355ceca44975a167381b1fd72ce5',
 )
 
 bower_component(
@@ -143,6 +170,7 @@ bower_component(
   version = '1.1.1',
   deps = [
     ':iron-fit-behavior',
+    ':iron-resizable-behavior',
     ':polymer',
   ],
   license = 'polymer',
@@ -150,28 +178,12 @@ bower_component(
 )
 
 bower_component(
-  name = 'iron-fit-behavior',
-  package = 'polymerelements/iron-fit-behavior',
-  version = '1.0.5',
+  name = 'iron-resizable-behavior',
+  package = 'polymerelements/iron-resizable-behavior',
+  version = '1.0.2',
   deps = [':polymer'],
   license = 'polymer',
-  sha1 = 'c0273d22531451a1e64f447971ad16b357a7f7e0',
-)
-
-bower_component(
-  name = 'neon-animation',
-  package = 'polymerelements/neon-animation',
-  version = '1.0.8',
-  deps = [
-    ':iron-meta',
-    ':iron-resizable-behavior',
-    ':iron-selector',
-    ':paper-styles',
-    ':web-animations-js',
-    ':polymer'
-  ],
-  license = 'polymer',
-  sha1 = 'c5f3700e9259554db14f9dfddb290a42c099d88a',
+  sha1 = '954e82c70b5412d20e7b4d65195a844bb6dc9a07',
 )
 
 bower_component(
@@ -183,54 +195,6 @@ bower_component(
   sha1 = '7559560733882656bf479b620669a1d60c3bda21',
 )
 
-bower_component(
-  name = 'paper-styles',
-  package = 'polymerelements/paper-styles',
-  version = '1.0.13',
-  deps = [
-    ':font-roboto',
-    ':iron-flex-layout',
-    ':polymer',
-  ],
-  license = 'polymer',
-  sha1 = 'e0bfdadfe10e070f39c16aa784de16734eed25a6',
-)
-
-bower_component(
-  name = 'font-roboto',
-  package = 'polymerelements/font-roboto',
-  version = '1.0.1',
-  license = 'polymer',
-  sha1 = '735676217f67221903d6be10cc2fb1b336bed13f',
-)
-
-bower_component(
-  name = 'iron-flex-layout',
-  package = 'polymerelements/iron-flex-layout',
-  version = '1.2.2',
-  deps = [':polymer'],
-  license = 'polymer',
-  sha1 = '3ca2fbbf3b56d95677663f78304262dee68753c3',
-)
-
-bower_component(
-  name = 'web-animations-js',
-  package = 'web-animations-js',
-  version = '2.1.2',
-  deps = [],
-  license = 'Apache2.0',
-  sha1 = '3e2f4648b770183f577cb5171785cfedcb3a960b',
-)
-
-bower_component(
-  name = 'iron-meta',
-  package = 'polymerelements/iron-meta',
-  version = '1.1.1',
-  deps = [':polymer'],
-  license = 'polymer',
-  sha1 = 'e06281b6ddb3355ceca44975a167381b1fd72ce5',
-)
-
 bower_component(
   name = 'iron-test-helpers',
   package = 'polymerelements/iron-test-helpers',
@@ -253,6 +217,22 @@ bower_component(
   sha1 = '5a68250d6d9abcd576f116dc4fc7312426323883',
 )
 
+bower_component(
+  name = 'neon-animation',
+  package = 'polymerelements/neon-animation',
+  version = '1.0.8',
+  deps = [
+    ':iron-meta',
+    ':iron-resizable-behavior',
+    ':iron-selector',
+    ':paper-styles',
+    ':polymer',
+    ':web-animations-js',
+  ],
+  license = 'polymer',
+  sha1 = 'c5f3700e9259554db14f9dfddb290a42c099d88a',
+)
+
 bower_component(
   name = 'page',
   package = 'visionmedia/page.js',
@@ -261,6 +241,19 @@ bower_component(
   sha1 = 'cc442386d4e392be26c85873f463db76fafbaeaf',
 )
 
+bower_component(
+  name = 'paper-styles',
+  package = 'polymerelements/paper-styles',
+  version = '1.0.13',
+  deps = [
+    ':font-roboto',
+    ':iron-flex-layout',
+    ':polymer',
+  ],
+  license = 'polymer',
+  sha1 = 'e0bfdadfe10e070f39c16aa784de16734eed25a6',
+)
+
 bower_component(
   name = 'polymer',
   package = 'polymer/polymer',
@@ -288,6 +281,14 @@ bower_component(
   sha1 = '21192d554ff6ad7eea894ca751c73b6bc46867dc',
 )
 
+bower_component(
+  name = 'web-animations-js',
+  package = 'web-animations/web-animations-js',
+  version = '2.1.2',
+  license = 'Apache2.0',
+  sha1 = '3e2f4648b770183f577cb5171785cfedcb3a960b',
+)
+
 bower_component(
   name = 'webcomponentsjs',
   package = 'webcomponentsjs',
diff --git a/tools/js/bower2buck.py b/tools/js/bower2buck.py
index 16c59092cf..31c6dfe2ce 100755
--- a/tools/js/bower2buck.py
+++ b/tools/js/bower2buck.py
@@ -164,6 +164,11 @@ def collect_rules(packages):
     # e.g. 'PolymerElements/iron-ajax', is not found anywhere in this
     # bower.json, which only contains 'iron-ajax'. Build up a map of short name
     # to package name so we can resolve them later.
+    # TODO(dborowitz): We can do better:
+    #  - Infer 'user/package' from GitHub URLs (i.e. a simple subset of Bower's package
+    #    resolution logic).
+    #  - Resolve aliases using https://bower.herokuapp.com/packages/shortname
+    #    (not currently biting us but it might in the future.)
     for n, v in rule.deps.iteritems():
       p = get_package_name(n, v)
       old = packages.get(n)