general refactoring/renaming