diff --git a/.project b/.project
index 780766b..ff3afa4 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>pubcache</name>
+	<name>pub_cache</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -23,5 +23,13 @@
 				<id>com.google.dart.tools.core.packagesFolderMatcher</id>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1426882679114</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>com.google.dart.tools.core.packagesFolderMatcher</id>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>
diff --git a/README.md b/README.md
index d30f622..b556851 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# pubcache
+# pub_cache
 
 A library to reflect on the local pub cache.
 
-[![Build Status](https://travis-ci.org/dart-lang/pubcache.svg)](https://travis-ci.org/dart-lang/pubcache)
+[![Build Status](https://travis-ci.org/dart-lang/pub_cache.svg)](https://travis-ci.org/dart-lang/pub_cache)
 
 ## Features and bugs
 
 Please file feature requests and bugs at the [issue tracker][tracker].
 
-[tracker]: https://github.com/dart-lang/pubcache/issues
+[tracker]: https://github.com/dart-lang/pub_cache/issues
diff --git a/example/list.dart b/example/list.dart
index 7a40694..a4fd55a 100644
--- a/example/list.dart
+++ b/example/list.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:pubcache/pubcache.dart';
+import 'package:pub_cache/pub_cache.dart';
 
 void main(List<String> args) {
   PubCache cache = new PubCache();
diff --git a/lib/pubcache.dart b/lib/pub_cache.dart
similarity index 99%
rename from lib/pubcache.dart
rename to lib/pub_cache.dart
index e9516ce..c9e622a 100644
--- a/lib/pubcache.dart
+++ b/lib/pub_cache.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library pubcache;
+library pub_cache;
 
 import 'dart:io';
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 6a3a6a0..7ed42a8 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,8 +1,8 @@
-name: pubcache
+name: pub_cache
 version: 0.0.1
 description: A library to reflect on the local pub cache.
 author: Dart Team <misc@dartlang.org>
-homepage: https://github.com/dart-lang/pubcache
+homepage: https://github.com/dart-lang/pub_cache
 
 environment:
   sdk: '>=1.0.0 <2.0.0'
diff --git a/test/all.dart b/test/all.dart
index e32f7d9..51a8a08 100644
--- a/test/all.dart
+++ b/test/all.dart
@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'pubcache_test.dart' as pubcache_test;
+import 'pub_cache_test.dart' as pub_cache_test;
 
 void main() {
-  pubcache_test.defineTests();
+  pub_cache_test.defineTests();
 }
diff --git a/test/pubcache_test.dart b/test/pub_cache_test.dart
similarity index 93%
rename from test/pubcache_test.dart
rename to test/pub_cache_test.dart
index 187f8dc..d5a554c 100644
--- a/test/pubcache_test.dart
+++ b/test/pub_cache_test.dart
@@ -2,12 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library pubcache_test;
+library pub_cache_test;
 
 import 'dart:io';
 
 import 'package:path/path.dart' as path;
-import 'package:pubcache/pubcache.dart';
+import 'package:pub_cache/pub_cache.dart';
 import 'package:unittest/unittest.dart';
 
 void main() => defineTests();
diff --git a/tool/travis.sh b/tool/travis.sh
index 61f5a63..cb51e39 100755
--- a/tool/travis.sh
+++ b/tool/travis.sh
@@ -10,7 +10,7 @@
 # Verify that the libraries are error free.
 dartanalyzer --fatal-warnings \
   example/list.dart \
-  lib/pubcache.dart \
+  lib/pub_cache.dart \
   test/all.dart
 
 # Run the tests.