I think @Danielss89 talk to review every ServiceNames and bring a consistent naming for the service keys but this will be a other PR