Fixes service names