Codestyle fixes
Use provided service_name for service notification