The current code mixes service type and service name based on
the context. Service type should be service type allways. The
same applies on service name. The patch clears the difference
between these two different variables.
Story: 2005820
Task: 33577
Change-Id: Ifdeaa2b854dfa2dcfda1491b522e4e67b822fc4f