Renaming of various modules/functions