diff --git a/modules/@angular/compiler/src/jit/compiler.ts b/modules/@angular/compiler/src/jit/compiler.ts
index a645977bbf..d9a4a6a837 100644
--- a/modules/@angular/compiler/src/jit/compiler.ts
+++ b/modules/@angular/compiler/src/jit/compiler.ts
@@ -114,7 +114,7 @@ export class JitCompiler implements Compiler {
     // Note: the loadingPromise for a module only includes the loading of the exported directives
     // of imported modules.
     // However, for runtime compilation, we want to transitively compile all modules,
-    // so we also need to call loadNgModuleMetadata for all nested modules.
+    // so we also need to call loadNgModuleDirectiveAndPipeMetadata for all nested modules.
     ngModule.transitiveModule.modules.forEach((localModuleMeta) => {
       loadingPromises.push(this._metadataResolver.loadNgModuleDirectiveAndPipeMetadata(
           localModuleMeta.reference, isSync));
diff --git a/modules/@angular/compiler/src/metadata_resolver.ts b/modules/@angular/compiler/src/metadata_resolver.ts
index e7ccd1df97..d3520efece 100644
--- a/modules/@angular/compiler/src/metadata_resolver.ts
+++ b/modules/@angular/compiler/src/metadata_resolver.ts
@@ -377,14 +377,14 @@ export class CompileMetadataResolver {
 
   /**
    * Gets the metadata for the given directive.
-   * This assumes `loadNgModuleMetadata` has been called first.
+   * This assumes `loadNgModuleDirectiveAndPipeMetadata` has been called first.
    */
   getDirectiveMetadata(directiveType: any): cpl.CompileDirectiveMetadata {
     const dirMeta = this._directiveCache.get(directiveType);
     if (!dirMeta) {
       this._reportError(
           new SyntaxError(
-              `Illegal state: getDirectiveMetadata can only be called after loadNgModuleMetadata for a module that declares it. Directive ${stringifyType(directiveType)}.`),
+              `Illegal state: getDirectiveMetadata can only be called after loadNgModuleDirectiveAndPipeMetadata for a module that declares it. Directive ${stringifyType(directiveType)}.`),
           directiveType);
     }
     return dirMeta;
@@ -732,14 +732,14 @@ export class CompileMetadataResolver {
 
   /**
    * Gets the metadata for the given pipe.
-   * This assumes `loadNgModuleMetadata` has been called first.
+   * This assumes `loadNgModuleDirectiveAndPipeMetadata` has been called first.
    */
   getPipeMetadata(pipeType: any): cpl.CompilePipeMetadata {
     const pipeMeta = this._pipeCache.get(pipeType);
     if (!pipeMeta) {
       this._reportError(
           new SyntaxError(
-              `Illegal state: getPipeMetadata can only be called after loadNgModuleMetadata for a module that declares it. Pipe ${stringifyType(pipeType)}.`),
+              `Illegal state: getPipeMetadata can only be called after loadNgModuleDirectiveAndPipeMetadata for a module that declares it. Pipe ${stringifyType(pipeType)}.`),
           pipeType);
     }
     return pipeMeta;