Change service names according to new convention