Brutal name refactors
Brutal Refactor