fix service class names