Renamed class bugfixes
Service/Trait brainstorm