Fixed more issues on renaming modules.