a lot of code was loading the service using it's implementation name,
which is why this got missed earlier.

Change-Id: I0b150bc9383a1a3a09ab905c4ddb7f914e69638d