Renaming classes and methods + random fixes in services