renaming some modules
renaming some module names