Changed to use id to distinguish services

Jira issue: wp-1253