mad refactoring, renaming