Renamed classes and templates to make the usage a bit more obvious