Fix bad Service names