consistent module renaming