Use correct service name
Bug fix release
Potential future enhancements