Fixes #5454 standardizes service names