diff --git a/default.xml b/default.xml
index 05ec002..9b7a247 100644
--- a/default.xml
+++ b/default.xml
@@ -31,54 +31,54 @@
 <project path="test/fabric-oftest" name="fabric-oftest" groups="test"/>
 
 <project path="orchestration/xos" name="xos" groups="orchestration"/>
-<project path="orchestration/xos_services/addressmanager" name="addressmanager" groups="orchestration,services"/>
-<project path="orchestration/xos_services/templateservice" name="templateservice" groups="orchestration,services"/>
-<project path="orchestration/xos_services/fabric" name="fabric" groups="orchestration,services"/>
-<project path="orchestration/xos_services/fabric-crossconnect" name="fabric-crossconnect" groups="orchestration,services"/>
-<project path="orchestration/xos_services/hypercache" name="hypercache" groups="orchestration,services"/>
-<project path="orchestration/xos_services/kubernetes-service" name="kubernetes-service" groups="orchestration,services"/>
-<project path="orchestration/xos_services/monitoring" name="monitoring" groups="orchestration,services"/>
-<project path="orchestration/xos_services/onos-service" name="onos-service" groups="orchestration,services"/>
-<project path="orchestration/xos_services/openstack" name="openstack" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vrouter" name="vrouter" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vsg" name="vsg" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vsg-hw" name="vsg-hw" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vtr" name="vtr" groups="orchestration,services"/>
-<project path="orchestration/xos_services/globalxos" name="globalxos" groups="orchestration,services"/>
-<project path="orchestration/xos_services/olt-service" name="olt-service" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vtn-service" name="vtn-service" groups="orchestration,services"/>
-<project path="orchestration/xos_services/hippie-oss" name="hippie-oss" groups="orchestration,services"/>
-<project path="orchestration/xos_services/att-workflow-driver" name="att-workflow-driver" groups="orchestration,services"/>
+<project path="orchestration/xos-services/addressmanager" name="addressmanager" groups="orchestration,services"/>
+<project path="orchestration/xos-services/templateservice" name="templateservice" groups="orchestration,services"/>
+<project path="orchestration/xos-services/fabric" name="fabric" groups="orchestration,services"/>
+<project path="orchestration/xos-services/fabric-crossconnect" name="fabric-crossconnect" groups="orchestration,services"/>
+<project path="orchestration/xos-services/hypercache" name="hypercache" groups="orchestration,services"/>
+<project path="orchestration/xos-services/kubernetes-service" name="kubernetes-service" groups="orchestration,services"/>
+<project path="orchestration/xos-services/monitoring" name="monitoring" groups="orchestration,services"/>
+<project path="orchestration/xos-services/onos-service" name="onos-service" groups="orchestration,services"/>
+<project path="orchestration/xos-services/openstack" name="openstack" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vrouter" name="vrouter" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vsg" name="vsg" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vsg-hw" name="vsg-hw" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vtr" name="vtr" groups="orchestration,services"/>
+<project path="orchestration/xos-services/globalxos" name="globalxos" groups="orchestration,services"/>
+<project path="orchestration/xos-services/olt-service" name="olt-service" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vtn-service" name="vtn-service" groups="orchestration,services"/>
+<project path="orchestration/xos-services/hippie-oss" name="hippie-oss" groups="orchestration,services"/>
+<project path="orchestration/xos-services/att-workflow-driver" name="att-workflow-driver" groups="orchestration,services"/>
 
-<project path="orchestration/xos_services/vbbu" name="vBBU" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vmme" name="vMME" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vpgwc" name="vPGWC" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vsgw" name="vSGW" groups="orchestration,services"/>
-<project path="orchestration/xos_services/progran" name="progran" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vhss" name="vHSS" groups="orchestration,services"/>
-<project path="orchestration/xos_services/hss_db" name="hss_db" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vmm" name="vMM" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vsm" name="vSM" groups="orchestration,services"/>
-<project path="orchestration/xos_services/venb" name="venb" groups="orchestration,services"/>
-<project path="orchestration/xos_services/internetemulator" name="internetemulator" groups="orchestration,services"/>
-<project path="orchestration/xos_services/sdn-controller" name="sdn-controller" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vspgwc" name="vspgwc" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vspgwu" name="vspgwu" groups="orchestration,services"/>
-<project path="orchestration/xos_services/epc-service" name="epc-service" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vbbu" name="vBBU" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vmme" name="vMME" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vpgwc" name="vPGWC" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vsgw" name="vSGW" groups="orchestration,services"/>
+<project path="orchestration/xos-services/progran" name="progran" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vhss" name="vHSS" groups="orchestration,services"/>
+<project path="orchestration/xos-services/hss_db" name="hss_db" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vmm" name="vMM" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vsm" name="vSM" groups="orchestration,services"/>
+<project path="orchestration/xos-services/venb" name="venb" groups="orchestration,services"/>
+<project path="orchestration/xos-services/internetemulator" name="internetemulator" groups="orchestration,services"/>
+<project path="orchestration/xos-services/sdn-controller" name="sdn-controller" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vspgwc" name="vspgwc" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vspgwu" name="vspgwu" groups="orchestration,services"/>
+<project path="orchestration/xos-services/epc-service" name="epc-service" groups="orchestration,services"/>
 
-<project path="orchestration/xos_services/vEE" name="vEE" groups="orchestration,services"/>
-<project path="orchestration/xos_services/vEG" name="vEG" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vEE" name="vEE" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vEG" name="vEG" groups="orchestration,services"/>
 <project path="onos-apps/apps/carrierethernet" name="carrierethernet" groups="onos" upstream="master"/>
-<project path="orchestration/xos_services/vnaas" name="vnaas" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vnaas" name="vnaas" groups="orchestration,services"/>
 
-<project path="orchestration/xos_services/exampleservice" name="exampleservice" groups="orchestration,services"/>
-<project path="orchestration/xos_services/simpleexampleservice" name="simpleexampleservice" groups="orchestration,services"/>
-<project path="orchestration/xos_services/k8sepcservice" name="k8sepcservice" groups="orchestration,services"/>
+<project path="orchestration/xos-services/exampleservice" name="exampleservice" groups="orchestration,services"/>
+<project path="orchestration/xos-services/simpleexampleservice" name="simpleexampleservice" groups="orchestration,services"/>
+<project path="orchestration/xos-services/k8sepcservice" name="k8sepcservice" groups="orchestration,services"/>
 
-<project path="orchestration/xos_services/acordion" name="acordion" groups="orchestration,services"/>
+<project path="orchestration/xos-services/acordion" name="acordion" groups="orchestration,services"/>
 
-<project path="orchestration/xos_services/rcord" name="rcord" groups="orchestration,services"/>
-<project path="orchestration/xos_services/mcord" name="mcord" groups="orchestration,services"/>
+<project path="orchestration/xos-services/rcord" name="rcord" groups="orchestration,services"/>
+<project path="orchestration/xos-services/mcord" name="mcord" groups="orchestration,services"/>
 
 <project path="orchestration/xos-gui" name="xos-gui" groups="orchestration"/>
 <project path="orchestration/xos-tosca" name="xos-tosca" groups="orchestration"/>