Merge "Fix module-file name collisions"