Fixed bugs resulting from renaming modules.