simple renaming of some stuff