More service name fixes