Fix broken service name references