diff --git a/CHANGELOG.md b/CHANGELOG.md
index fde7f68f3702..d62594dbd9a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,7 +44,7 @@ imports only the set of components actually used in the application.
 * Angular Material now depends on Angular 4.
 * Now that animations have been refactored into a separate package, users of `@angular/material`
 need to explicitly import `BrowserAnimationsModule` (or `NoopAnimationsModule`) from
-`@angular/package-browser/animations` as well as installing `@angular/animations`.
+`@angular/platform-browser/animations` as well as installing `@angular/animations`.
 
 
 
diff --git a/guides/getting-started.md b/guides/getting-started.md
index bcbc142137ed..202ed5e12e6c 100644
--- a/guides/getting-started.md
+++ b/guides/getting-started.md
@@ -65,7 +65,7 @@ Including a theme is **required** to apply all of the core and theme styles to y
 To get started with a prebuilt theme, include the following in your app's index.html:
 
 ```html
-<link href="node_modules/@angular/material/core/theming/prebuilt/indigo-pink.css" rel="stylesheet">
+<link href="node_modules/@angular/material/prebuilt-themes/indigo-pink.css" rel="stylesheet">
 ```
 
 Note that your app's project structure may have a different relative location for your node_modules.
diff --git a/guides/theming-your-components.md b/guides/theming-your-components.md
index 6922749b1b29..1000151cd4b3 100644
--- a/guides/theming-your-components.md
+++ b/guides/theming-your-components.md
@@ -14,7 +14,7 @@ All you need is to create a `@mixin` function in the custom-component-theme.scss
 
 ```scss
 // Import all the tools needed to customize the theme and extract parts of it
-@import '~@angular/material/core/theming/all-theme';
+@import '~@angular/material/theming';
 
 // Define a mixin that accepts a theme and outputs the color styles for the component.
 @mixin candy-carousel-theme($theme) {
@@ -33,7 +33,7 @@ Now you just have to call the `@mixin` function to apply the theme:
 
 ```scss
 // Import a pre-built theme
-@import '~@angular/material/core/theming/prebuilt/deeppurple-amber';
+@import '~@angular/material/prebuilt-themes/deeppurple-amber.css';
 // Import your custom input theme file so you can call the custom-input-theme function
 @import 'app/candy-carousel/candy-carousel-theme.scss';
 
@@ -53,11 +53,12 @@ Styles that are affected by the theme should be placed in a separated theming fi
 
 
 ## Using colors from a palette
-You can consume the theming functions from the `@angular/material/core/theming/theming` and Material palette vars from `@angular/material/core/theming/palette`. You can use the `mat-color` function to extract a specific color from a palette. For example:
+You can consume the theming functions and Material palette variables from `@angular/material/theming`.
+You can use the `mat-color` function to extract a specific color from a palette. For example:
 
 ```scss
 // Import theming functions
-@import '~@angular/material/core/theming/theming';
+@import '~@angular/material/theming';
 // Import your custom theme
 @import 'src/unicorn-app-theme.scss';