Merge "Clean up dangling module names"