diff --git a/aio/src/app/app.component.ts b/aio/src/app/app.component.ts
index 377088813a..6b447cb684 100644
--- a/aio/src/app/app.component.ts
+++ b/aio/src/app/app.component.ts
@@ -287,7 +287,7 @@ export class AppComponent implements OnInit {
   @HostListener('window:scroll')
   onScroll() {
     if (!this.tocMaxHeightOffset) {
-      // Must wait until now for md-toolbar to be measurable.
+      // Must wait until now for mat-toolbar to be measurable.
       const el = this.hostElement.nativeElement as Element;
       this.tocMaxHeightOffset =
           el.querySelector('footer').clientHeight +
diff --git a/aio/src/app/app.module.ts b/aio/src/app/app.module.ts
index 32181ba900..70aa8a5637 100644
--- a/aio/src/app/app.module.ts
+++ b/aio/src/app/app.module.ts
@@ -17,7 +17,7 @@ import {
   Platform
 } from '@angular/material';
 
-// Temporary fix for MdSidenavModule issue:
+// Temporary fix for MatSidenavModule issue:
 // crashes with "missing first" operator when SideNav.mode is "over"
 import 'rxjs/add/operator/first';
 
@@ -49,7 +49,7 @@ import { WindowToken, windowProvider } from 'app/shared/window';
 
 import { SharedModule } from 'app/shared/shared.module';
 
-// These are the hardcoded inline svg sources to be used by the `<md-icon>` component
+// These are the hardcoded inline svg sources to be used by the `<mat-icon>` component
 export const svgIconProviders = [
   {
     provide: SVG_ICONS,
diff --git a/aio/src/app/embedded/code/code.component.spec.ts b/aio/src/app/embedded/code/code.component.spec.ts
index c8ca662479..1b7de0d68e 100644
--- a/aio/src/app/embedded/code/code.component.spec.ts
+++ b/aio/src/app/embedded/code/code.component.spec.ts
@@ -267,7 +267,7 @@ describe('CodeComponent', () => {
 @Component({
   selector: 'aio-host-comp',
   template: `
-    <aio-code md-no-ink [code]="code" [language]="language"
+    <aio-code [code]="code" [language]="language"
     [linenums]="linenums" [path]="path" [region]="region"
     [hideCopy]="hideCopy" [title]="title"></aio-code>
   `
diff --git a/aio/src/styles/2-modules/_buttons.scss b/aio/src/styles/2-modules/_buttons.scss
index 4ef6cd5be1..2ebda268bb 100644
--- a/aio/src/styles/2-modules/_buttons.scss
+++ b/aio/src/styles/2-modules/_buttons.scss
@@ -1,7 +1,7 @@
 /* Button Styles */
 
 .button,
-a.button.md-button {
+a.button.mat-button {
   display: inline-block;
   line-height: 32px;
   padding: 0px 16px;
@@ -61,7 +61,7 @@ a.button.md-button {
   }
 
   &.button-shield,
-  &.button-shield.md-button {
+  &.button-shield.mat-button {
     background-color: $blue;
     background: $blue url('assets/images/logos/angular/angular_whiteTransparent.svg') 24px 13px no-repeat;
     color: rgba($white, .87);