renaming of the remaining stuff