diff --git a/LICENSE b/LICENSE
index 715666e..ba561b2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
 Copyright (c) 2013-2014 StrongLoop, Inc.
 
-loopback-storage-service uses a 'dual license' model. Users may use
-loopback-storage-service under the terms of the Artistic 2.0 license, or under
+loopback-component-storage uses a 'dual license' model. Users may use
+loopback-component-storage under the terms of the Artistic 2.0 license, or under
 the StrongLoop License. The text of both is included below.
 
 Artistic License 2.0
diff --git a/README.md b/README.md
index 4fd2c04..08ce7ac 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# loopback-storage-service
+# loopback-component-storage
 
 LoopBack storage service provides Node.js and REST APIs to manage binary contents
 using pluggable storage providers, such as local file systems, Amazon S3, or
@@ -13,13 +13,13 @@ storage services including:
 The binary artifacts are organized with containers and files. A container is the
 collection of files. Each file will belong to a container.
 
-## Define a model with the loopback-storage-service connector
+## Define a model with the loopback-component-storage connector
 
 LoopBack exposes the APIs using a model that is attached to a data source configured
-with the loopback-storage-service connector.
+with the loopback-component-storage connector.
 
     var ds = loopback.createDataSource({
-        connector: require('loopback-storage-service'),
+        connector: require('loopback-component-storage'),
         provider: 'filesystem',
         root: path.join(__dirname, 'storage')
     });
diff --git a/example/public/index.html b/example/public/index.html
index 55c02c8..e7ef4ad 100644
--- a/example/public/index.html
+++ b/example/public/index.html
@@ -45,7 +45,7 @@
     <div class="navbar navbar-default">
         <div class="navbar-header">
             <a class="navbar-brand"
-               href="https://github.com/strongloop/loopback-storage-service">LoopBack
+               href="https://github.com/strongloop/loopback-component-storage">LoopBack
                 Storage Service</a>
         </div>
     </div>
diff --git a/package.json b/package.json
index 5d61844..d399484 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "loopback-storage-service",
+  "name": "loopback-component-storage",
   "description": "Loopback Storage Service",
   "version": "1.0.4",
   "main": "index.js",
@@ -20,7 +20,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/strongloop/loopback-storage-service.git"
+    "url": "https://github.com/strongloop/loopback-component-storage.git"
   },
   "license": {
     "name": "Dual Artistic-2.0/StrongLoop",