Updated service / directory naming