diff --git a/modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts b/modules/@angular/common/src/pipes/invalid_pipe_argument_error.ts
similarity index 100%
rename from modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts
rename to modules/@angular/common/src/pipes/invalid_pipe_argument_error.ts
diff --git a/modules/@angular/core/src/di/reflective_exceptions.ts b/modules/@angular/core/src/di/reflective_errors.ts
similarity index 100%
rename from modules/@angular/core/src/di/reflective_exceptions.ts
rename to modules/@angular/core/src/di/reflective_errors.ts
diff --git a/modules/@angular/facade/src/exception_handler.ts b/modules/@angular/core/src/error_handler.ts
similarity index 100%
rename from modules/@angular/facade/src/exception_handler.ts
rename to modules/@angular/core/src/error_handler.ts
diff --git a/modules/@angular/core/src/linker/exceptions.ts b/modules/@angular/core/src/linker/errors.ts
similarity index 100%
rename from modules/@angular/core/src/linker/exceptions.ts
rename to modules/@angular/core/src/linker/errors.ts
diff --git a/modules/@angular/facade/test/exception_handler_spec.ts b/modules/@angular/core/test/error_handler_spec.ts
similarity index 100%
rename from modules/@angular/facade/test/exception_handler_spec.ts
rename to modules/@angular/core/test/error_handler_spec.ts
diff --git a/modules/@angular/facade/src/base_wrapped_exception.ts b/modules/@angular/facade/src/base_wrapped_exception.ts
deleted file mode 100644
index ab9fd1c498..0000000000
--- a/modules/@angular/facade/src/base_wrapped_exception.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-/**
- * A base class for the WrappedException that can be used to identify
- * a WrappedException from ExceptionHandler without adding circular
- * dependency.
- */
-export class BaseWrappedException extends Error {
-  constructor(message: string) { super(message); }
-
-  get wrapperMessage(): string { return ''; }
-  get wrapperStack(): any { return null; }
-  get originalException(): any { return null; }
-  get originalStack(): any { return null; }
-  get context(): any { return null; }
-  get message(): string { return ''; }
-}
diff --git a/modules/@angular/facade/src/exceptions.ts b/modules/@angular/facade/src/errors.ts
similarity index 100%
rename from modules/@angular/facade/src/exceptions.ts
rename to modules/@angular/facade/src/errors.ts