RESOLVED - issue NE-7: Decouple service name from service class name 
https://anyflow.atlassian.net/browse/NE-7