Minor commit-keeping file & service names consistent