diff --git a/src/App.tsx b/src/App.tsx
index 9ce3bf2c..8072bdbe 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -324,7 +324,7 @@ const App: React.FC = (): React.JSX.Element => {
     } else {
       setGeneratedCode('');
     }
-  }, [currentModule, triggerPythonRegeneration, blocklyComponent]);
+  }, [currentModule, project, triggerPythonRegeneration, blocklyComponent]);
 
   // Update toolbox when module or categories change
   React.useEffect(() => {
diff --git a/src/storage/common_storage.ts b/src/storage/common_storage.ts
index 7d59650b..8650fa5c 100644
--- a/src/storage/common_storage.ts
+++ b/src/storage/common_storage.ts
@@ -245,6 +245,7 @@ export async function renameModuleInProject(
         mechanism.moduleName = newModuleName;
         mechanism.className = proposedClassName;
       }
+      return newModulePath;
     } else if (module.moduleType === MODULE_TYPE_OPMODE) {
       const opMode = project.opModes.find(o => o.modulePath === module.modulePath);
       if (opMode) {