Renaming modules for consistency