refactoring and renaming of stuff