Just committing to shut up Tower
Refactored some names