Rename service class
Fixes