diff --git a/src/com/google/javascript/jscomp/CrossModuleCodeMotion.java b/src/com/google/javascript/jscomp/CrossModuleCodeMotion.java
index 839b9cc7ff9..5b1dc5e9b19 100644
--- a/src/com/google/javascript/jscomp/CrossModuleCodeMotion.java
+++ b/src/com/google/javascript/jscomp/CrossModuleCodeMotion.java
@@ -301,8 +301,8 @@ private void processRead(Reference ref, NamedInfo info) {
   }
 
   private void collectReferences(Node root) {
-    ReferenceCollectingCallback collector = new ReferenceCollectingCallback(
-        compiler, ReferenceCollectingCallback.DO_NOTHING_BEHAVIOR,
+    CrossModuleReferenceCollector collector = new CrossModuleReferenceCollector(
+        compiler, CrossModuleReferenceCollector.DO_NOTHING_BEHAVIOR,
         new Es6SyntacticScopeCreator(compiler),
         new Predicate<Var>() {
           @Override public boolean apply(Var var) {
@@ -325,7 +325,7 @@ private void collectReferences(Node root) {
   }
 
   private void processReference(
-      ReferenceCollectingCallback collector, Reference ref, NamedInfo info, Var v) {
+      CrossModuleReferenceCollector collector, Reference ref, NamedInfo info, Var v) {
     Node n = ref.getNode();
     if (isRecursiveDeclaration(v, n)) {
       return;
@@ -387,7 +387,7 @@ private JSModule getModule(Reference ref) {
    * where "movable object" is a literal or a function.
    */
   private boolean maybeProcessDeclaration(
-      ReferenceCollectingCallback collector, Reference ref, NamedInfo info) {
+      CrossModuleReferenceCollector collector, Reference ref, NamedInfo info) {
     Node name = ref.getNode();
     Node parent = name.getParent();
     Node grandparent = parent.getParent();
@@ -453,7 +453,7 @@ private boolean maybeProcessDeclaration(
    * Determines whether the given value is eligible to be moved across modules.
    */
   private static boolean canMoveValue(
-      ReferenceCollectingCallback collector, Scope scope, Node n) {
+      CrossModuleReferenceCollector collector, Scope scope, Node n) {
     // the value is only movable if it's
     // a) nothing,
     // b) a constant literal,