Fixed class names in services