diff --git a/lib/motion/project/builder.rb b/lib/motion/project/builder.rb
index 080ec46a..e5ad94b1 100644
--- a/lib/motion/project/builder.rb
+++ b/lib/motion/project/builder.rb
@@ -635,9 +635,25 @@ PLIST
       def on_const_path_ref(parent, args)
         type, name, position = args
         if type == :@const
-          @defined << name
           @referred << name
         end
+        args
+      end
+
+      def on_module(const, *args)
+        type, name = const
+        if type == :@const
+          @defined << name
+          @referred.delete(name)
+        end
+      end
+
+      def on_class(const, *args)
+        type, name = const
+        if type == :@const
+          @defined << name
+          @referred.delete(name)
+        end
       end
     end
   end