A bit of rebranding
Just a bit of refactoring