Cleaned-up service names and fixed threading bugs