diff --git a/build.sh b/build.sh
index c66cf2dd68..a9a9bad088 100755
--- a/build.sh
+++ b/build.sh
@@ -51,7 +51,7 @@ for PACKAGE in \
   router \
   router-deprecated \
   upgrade \
-  compiler_cli
+  compiler-cli
 do
   SRCDIR=./modules/@angular/${PACKAGE}
   DESTDIR=./dist/packages-dist/${PACKAGE}
@@ -80,7 +80,7 @@ do
     find ${DESTDIR} -type f -name '*.d.ts' -print0 | xargs -0 sed -i '' -E 's/^( +)abstract ([[:alnum:]]+\:)/\1\2/g'
   fi
 
-  if [[ ${PACKAGE} != compiler_cli ]]; then
+  if [[ ${PACKAGE} != compiler-cli ]]; then
 
     if [[ ${PACKAGE} == "router-deprecated" ]]; then
       echo "====== (esm)COMPILING: \$(npm bin)/tsc -p ${SRCDIR}/tsconfig-es2015.json ====="
diff --git a/karma-js.conf.js b/karma-js.conf.js
index cf1b5faea9..7b839222e3 100644
--- a/karma-js.conf.js
+++ b/karma-js.conf.js
@@ -39,7 +39,7 @@ module.exports = function(config) {
     exclude: [
       'dist/all/@angular/**/e2e_test/**',
       'dist/all/@angular/examples/**',
-      'dist/all/@angular/compiler_cli/**',
+      'dist/all/@angular/compiler-cli/**',
       'dist/all/angular1_router.js',
       'dist/all/@angular/platform-browser/testing/e2e_util.js'
     ],
diff --git a/modules/@angular/compiler_cli/README.md b/modules/@angular/compiler-cli/README.md
similarity index 100%
rename from modules/@angular/compiler_cli/README.md
rename to modules/@angular/compiler-cli/README.md
diff --git a/modules/@angular/compiler_cli/index.ts b/modules/@angular/compiler-cli/index.ts
similarity index 100%
rename from modules/@angular/compiler_cli/index.ts
rename to modules/@angular/compiler-cli/index.ts
diff --git a/modules/@angular/compiler_cli/integrationtest/src/a/multiple_components.html b/modules/@angular/compiler-cli/integrationtest/src/a/multiple_components.html
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/src/a/multiple_components.html
rename to modules/@angular/compiler-cli/integrationtest/src/a/multiple_components.html
diff --git a/modules/@angular/compiler_cli/integrationtest/src/a/multiple_components.ts b/modules/@angular/compiler-cli/integrationtest/src/a/multiple_components.ts
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/src/a/multiple_components.ts
rename to modules/@angular/compiler-cli/integrationtest/src/a/multiple_components.ts
diff --git a/modules/@angular/compiler_cli/integrationtest/src/basic.css b/modules/@angular/compiler-cli/integrationtest/src/basic.css
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/src/basic.css
rename to modules/@angular/compiler-cli/integrationtest/src/basic.css
diff --git a/modules/@angular/compiler_cli/integrationtest/src/basic.html b/modules/@angular/compiler-cli/integrationtest/src/basic.html
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/src/basic.html
rename to modules/@angular/compiler-cli/integrationtest/src/basic.html
diff --git a/modules/@angular/compiler_cli/integrationtest/src/basic.ts b/modules/@angular/compiler-cli/integrationtest/src/basic.ts
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/src/basic.ts
rename to modules/@angular/compiler-cli/integrationtest/src/basic.ts
diff --git a/modules/@angular/compiler_cli/integrationtest/src/bootstrap.ts b/modules/@angular/compiler-cli/integrationtest/src/bootstrap.ts
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/src/bootstrap.ts
rename to modules/@angular/compiler-cli/integrationtest/src/bootstrap.ts
diff --git a/modules/@angular/compiler_cli/integrationtest/src/dep.d.ts b/modules/@angular/compiler-cli/integrationtest/src/dep.d.ts
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/src/dep.d.ts
rename to modules/@angular/compiler-cli/integrationtest/src/dep.d.ts
diff --git a/modules/@angular/compiler_cli/integrationtest/src/features.ts b/modules/@angular/compiler-cli/integrationtest/src/features.ts
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/src/features.ts
rename to modules/@angular/compiler-cli/integrationtest/src/features.ts
diff --git a/modules/@angular/compiler_cli/integrationtest/src/projection.ts b/modules/@angular/compiler-cli/integrationtest/src/projection.ts
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/src/projection.ts
rename to modules/@angular/compiler-cli/integrationtest/src/projection.ts
diff --git a/modules/@angular/compiler_cli/integrationtest/src/shared.css b/modules/@angular/compiler-cli/integrationtest/src/shared.css
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/src/shared.css
rename to modules/@angular/compiler-cli/integrationtest/src/shared.css
diff --git a/modules/@angular/compiler_cli/integrationtest/test/basic_spec.ts b/modules/@angular/compiler-cli/integrationtest/test/basic_spec.ts
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/test/basic_spec.ts
rename to modules/@angular/compiler-cli/integrationtest/test/basic_spec.ts
diff --git a/modules/@angular/compiler_cli/integrationtest/test/projection_spec.ts b/modules/@angular/compiler-cli/integrationtest/test/projection_spec.ts
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/test/projection_spec.ts
rename to modules/@angular/compiler-cli/integrationtest/test/projection_spec.ts
diff --git a/modules/@angular/compiler_cli/integrationtest/tsconfig.json b/modules/@angular/compiler-cli/integrationtest/tsconfig.json
similarity index 100%
rename from modules/@angular/compiler_cli/integrationtest/tsconfig.json
rename to modules/@angular/compiler-cli/integrationtest/tsconfig.json
diff --git a/modules/@angular/compiler_cli/package.json b/modules/@angular/compiler-cli/package.json
similarity index 98%
rename from modules/@angular/compiler_cli/package.json
rename to modules/@angular/compiler-cli/package.json
index b0a6f6db20..c85548334b 100644
--- a/modules/@angular/compiler_cli/package.json
+++ b/modules/@angular/compiler-cli/package.json
@@ -34,5 +34,5 @@
   "bugs": {
     "url": "https://github.com/angular/angular/issues"
   },
-  "homepage": "https://github.com/angular/angular/tree/master/tools/compiler_cli"
+  "homepage": "https://github.com/angular/angular/tree/master/tools/compiler-cli"
 }
diff --git a/modules/@angular/compiler_cli/src/codegen.ts b/modules/@angular/compiler-cli/src/codegen.ts
similarity index 100%
rename from modules/@angular/compiler_cli/src/codegen.ts
rename to modules/@angular/compiler-cli/src/codegen.ts
diff --git a/modules/@angular/compiler_cli/src/compiler_private.ts b/modules/@angular/compiler-cli/src/compiler_private.ts
similarity index 100%
rename from modules/@angular/compiler_cli/src/compiler_private.ts
rename to modules/@angular/compiler-cli/src/compiler_private.ts
diff --git a/modules/@angular/compiler_cli/src/core_private.ts b/modules/@angular/compiler-cli/src/core_private.ts
similarity index 100%
rename from modules/@angular/compiler_cli/src/core_private.ts
rename to modules/@angular/compiler-cli/src/core_private.ts
diff --git a/modules/@angular/compiler_cli/src/main.ts b/modules/@angular/compiler-cli/src/main.ts
similarity index 100%
rename from modules/@angular/compiler_cli/src/main.ts
rename to modules/@angular/compiler-cli/src/main.ts
diff --git a/modules/@angular/compiler_cli/src/reflector_host.ts b/modules/@angular/compiler-cli/src/reflector_host.ts
similarity index 100%
rename from modules/@angular/compiler_cli/src/reflector_host.ts
rename to modules/@angular/compiler-cli/src/reflector_host.ts
diff --git a/modules/@angular/compiler_cli/src/static_reflection_capabilities.ts b/modules/@angular/compiler-cli/src/static_reflection_capabilities.ts
similarity index 100%
rename from modules/@angular/compiler_cli/src/static_reflection_capabilities.ts
rename to modules/@angular/compiler-cli/src/static_reflection_capabilities.ts
diff --git a/modules/@angular/compiler_cli/src/static_reflector.ts b/modules/@angular/compiler-cli/src/static_reflector.ts
similarity index 100%
rename from modules/@angular/compiler_cli/src/static_reflector.ts
rename to modules/@angular/compiler-cli/src/static_reflector.ts
diff --git a/modules/@angular/compiler_cli/test/static_reflector_spec.ts b/modules/@angular/compiler-cli/test/static_reflector_spec.ts
similarity index 99%
rename from modules/@angular/compiler_cli/test/static_reflector_spec.ts
rename to modules/@angular/compiler-cli/test/static_reflector_spec.ts
index f3c2b6b257..79bb24c1e3 100644
--- a/modules/@angular/compiler_cli/test/static_reflector_spec.ts
+++ b/modules/@angular/compiler-cli/test/static_reflector_spec.ts
@@ -13,7 +13,7 @@ import {
   StaticReflector,
   StaticReflectorHost,
   StaticSymbol
-} from '@angular/compiler_cli/src/static_reflector';
+} from '@angular/compiler-cli/src/static_reflector';
 
 describe('StaticReflector', () => {
   let noContext = new StaticSymbol('', '');
diff --git a/modules/@angular/compiler_cli/tsconfig-es5.json b/modules/@angular/compiler-cli/tsconfig-es5.json
similarity index 94%
rename from modules/@angular/compiler_cli/tsconfig-es5.json
rename to modules/@angular/compiler-cli/tsconfig-es5.json
index fba5e12947..cb01ddface 100644
--- a/modules/@angular/compiler_cli/tsconfig-es5.json
+++ b/modules/@angular/compiler-cli/tsconfig-es5.json
@@ -20,7 +20,7 @@
         "experimentalDecorators": true,
         "rootDir": ".",
         "sourceRoot": ".",
-        "outDir": "../../../dist/packages-dist/compiler_cli",
+        "outDir": "../../../dist/packages-dist/compiler-cli",
         "declaration": true
     },
     "exclude": ["integrationtest"],
diff --git a/modules/tsconfig.json b/modules/tsconfig.json
index a67e12e739..d9957851cf 100644
--- a/modules/tsconfig.json
+++ b/modules/tsconfig.json
@@ -31,6 +31,6 @@
     "rollup-test",
     "upgrade-ts2dart.d.ts",
     "zone-ts2dart.d.ts",
-    "@angular/compiler_cli/integrationtest"
+    "@angular/compiler-cli/integrationtest"
   ]
 }
diff --git a/presubmit.sh b/presubmit.sh
index 8ff2e1a7f8..f95390f0ca 100755
--- a/presubmit.sh
+++ b/presubmit.sh
@@ -8,8 +8,8 @@ gulp check-format
 export NODE_PATH=$NODE_PATH:$(pwd)/dist/all
 ./build.sh;
 $(npm bin)/tsc -p tools
-$(npm bin)/tsc -p tools/compiler_cli/src
-# $(npm bin)/tsc -p tools/compiler_cli/test
+$(npm bin)/tsc -p tools/compiler-cli/src
+# $(npm bin)/tsc -p tools/compiler-cli/test
 node dist/tools/tsc-watch/ node
 
 ## rebuild since codegen has overwritten some files.
diff --git a/publish-packages.sh b/publish-packages.sh
index c17e3654fb..9dbe891046 100755
--- a/publish-packages.sh
+++ b/publish-packages.sh
@@ -21,7 +21,7 @@ find ./dist/packages-dist/ -type f -name "*umd.js" -print0 | xargs -0 sed -i ''
 for PACKAGE in \
   core \
   compiler \
-  compiler_cli \
+  compiler-cli \
   common \
   http \
   platform-browser \
diff --git a/scripts/ci-lite/offline_compiler_test.sh b/scripts/ci-lite/offline_compiler_test.sh
index ed0f52d36d..e8ef3d1c76 100755
--- a/scripts/ci-lite/offline_compiler_test.sh
+++ b/scripts/ci-lite/offline_compiler_test.sh
@@ -3,7 +3,7 @@ set -ex -o pipefail
 
 # These ones can be `npm link`ed for fast development
 LINKABLE_PKGS=(
-  $(pwd)/dist/packages-dist/{common,core,compiler,compiler_cli,platform-{browser,server}}
+  $(pwd)/dist/packages-dist/{common,core,compiler,compiler-cli,platform-{browser,server}}
   $(pwd)/dist/tools/@angular/tsc-wrapped
 )
 PKGS=(
@@ -18,7 +18,7 @@ PKGS=(
 TMPDIR=${TMPDIR:-.}
 readonly TMP=$TMPDIR/e2e_test.$(date +%s)
 mkdir -p $TMP
-cp -R -v modules/@angular/compiler_cli/integrationtest/* $TMP
+cp -R -v modules/@angular/compiler-cli/integrationtest/* $TMP
 # Try to use the same versions as angular, in particular, this will
 # cause us to install the same rxjs version.
 cp -v package.json $TMP
@@ -30,10 +30,10 @@ cp -v package.json $TMP
   # TODO(alexeagle): allow this to be npm link instead
   npm install ${LINKABLE_PKGS[*]}
 
-  # Compile the compiler_cli integration tests
+  # Compile the compiler-cli integration tests
   ./node_modules/.bin/ngc
 
   ./node_modules/.bin/jasmine init
-  # Run compiler_cli integration tests in node
+  # Run compiler-cli integration tests in node
   ./node_modules/.bin/jasmine test/*_spec.js
 )
diff --git a/scripts/ci-lite/test_js.sh b/scripts/ci-lite/test_js.sh
index 6e2548c09a..66dfb7eb3f 100755
--- a/scripts/ci-lite/test_js.sh
+++ b/scripts/ci-lite/test_js.sh
@@ -34,7 +34,7 @@ echo 'travis_fold:end:test.unit.node'
 echo 'travis_fold:start:test.unit.localChrome'
 
 # rebuild to codegen files in @angular/compiler/test
-node dist/all/@angular/compiler_cli/src/main -p modules/tsconfig.json
+node dist/all/@angular/compiler-cli/src/main -p modules/tsconfig.json
 
 # Run unit tests in local chrome
 if [[ ${TRAVIS} ]]; then
diff --git a/tools/tsc-watch/index.ts b/tools/tsc-watch/index.ts
index 8ca4220e9b..fee1d08537 100644
--- a/tools/tsc-watch/index.ts
+++ b/tools/tsc-watch/index.ts
@@ -71,7 +71,7 @@ if (platform == 'node') {
       processOutputEmitterCodeGen,
       [
         'node', 'dist/tools/cjs-jasmine', '--', '{@angular,benchpress}/**/*_spec.js',
-        '@angular/compiler_cli/test/**/*_spec.js'
+        '@angular/compiler-cli/test/**/*_spec.js'
       ]
     ]
   });