Add use of displayName to distinguish services.

Also change semantics of contains() method to be more intuitive.

Jira issue: wp-1253