Updated how service directory naming works