fix servicenames