diff --git a/tools/collector/scripts/collect b/tools/collector/scripts/collect
index e4bb8a28..febd1868 100755
--- a/tools/collector/scripts/collect
+++ b/tools/collector/scripts/collect
@@ -207,8 +207,8 @@ function print_help()
     echo "collect --all --start-date 20150101                          ... logs dated on and after Jan 1 2015 from all hosts"
     echo "collect --all --start-date 20151101 --end-date 20160201      ... logs dated between Nov 1, 2015 and Feb 1 2016 from all hosts"
     echo "collect --start-date 20151101 --end-date 20160201            ... only logs dated between Nov 1, 2015 and Feb 1 2016 for current host"
-    echo "collect --list controller-0 compute-0 storage-0              ... all logs from specified host list"
-    echo "collect --list controller-0 compute-1 --end-date 20160201    ... only logs before Nov 1, 2015 for host list"
+    echo "collect --list controller-0 worker-0 storage-0              ... all logs from specified host list"
+    echo "collect --list controller-0 worker-1 --end-date 20160201    ... only logs before Nov 1, 2015 for host list"
     echo "collect --list controller-1 storage-0 --start-date 20160101  ... only logs after Jan 1 2016 for controller-1 and storage-0"
     echo ""
     exit 0
diff --git a/tools/collector/scripts/collect_host b/tools/collector/scripts/collect_host
index 873b191c..63596984 100755
--- a/tools/collector/scripts/collect_host
+++ b/tools/collector/scripts/collect_host
@@ -164,8 +164,8 @@ function collect_extra()
     delimiter ${LOGFILE} "pstree --arguments --ascii --long --show-pids"
     pstree --arguments --ascii --long --show-pids >> ${LOGFILE}
 
-    # Collect process, thread and scheduling info (compute subfunction only)
-    # (also gets process 'affinity' which is useful on computes;  
+    # Collect process, thread and scheduling info (worker subfunction only)
+    # (also gets process 'affinity' which is useful on workers;
     which ps-sched.sh >/dev/null 2>&1
     if [ $? -eq 0 ]; then
         delimiter ${LOGFILE} "ps-sched.sh"
@@ -226,7 +226,7 @@ function collect_extra()
         facter >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
     fi
 
-    if [[ "$nodetype" == "compute" || "$subfunction" == *"compute"* ]] ; then
+    if [[ "$nodetype" == "worker" || "$subfunction" == *"worker"* ]] ; then
         delimiter ${LOGFILE} "topology"
         topology >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
     fi
@@ -323,18 +323,18 @@ function collect_extra()
         delimiter ${LOGFILE} "targetcli sessions detail"
         targetcli sessions detail >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
 
-    elif [[ "$nodetype" == "compute" || "$subfunction" == *"compute"* ]] ; then
-        # Compute - iSCSI initiator information
+    elif [[ "$nodetype" == "worker" || "$subfunction" == *"worker"* ]] ; then
+        # Worker - iSCSI initiator information
         collect_dir=${EXTRA_DIR}/iscsi_initiator_info
         mkdir -p ${collect_dir}
         cp -rf /run/iscsi-cache/nodes/* ${collect_dir}
         find ${collect_dir} -type d -exec chmod 750 {} \;
 
-        # Compute - iSCSI initiator active sessions
+        # Worker - iSCSI initiator active sessions
         delimiter ${LOGFILE} "iscsiadm -m session"
         iscsiadm -m session >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
 
-        # Compute - iSCSI udev created nodes
+        # Worker - iSCSI udev created nodes
         delimiter  ${LOGFILE} "ls -la /dev/disk/by-path | grep \"iqn\""
         ls -la /dev/disk/by-path | grep "iqn" >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
     fi
diff --git a/tools/collector/scripts/collect_networking.sh b/tools/collector/scripts/collect_networking.sh
index d6066321..02a9e6c4 100755
--- a/tools/collector/scripts/collect_networking.sh
+++ b/tools/collector/scripts/collect_networking.sh
@@ -44,9 +44,9 @@ iptables -L -v -x -n -t mangle >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
 
 
 ###############################################################################
-# Only Compute
+# Only Worker
 ###############################################################################
-if [[ "$nodetype" = "compute" || "$subfunction" == *"compute"* ]] ; then
+if [[ "$nodetype" = "worker" || "$subfunction" == *"worker"* ]] ; then
     NAMESPACES=($(ip netns))
     for NS in ${NAMESPACES[@]}; do
         delimiter ${LOGFILE} "${NS}"
diff --git a/tools/collector/scripts/collect_ovs.sh b/tools/collector/scripts/collect_ovs.sh
index 96c3291a..94e98e69 100644
--- a/tools/collector/scripts/collect_ovs.sh
+++ b/tools/collector/scripts/collect_ovs.sh
@@ -17,9 +17,9 @@ LOGFILE="${extradir}/${SERVICE}.info"
 
 
 ###############################################################################
-# Only Compute Nodes
+# Only Worker Nodes
 ###############################################################################
-if [[ "$nodetype" == "compute" || "$subfunction" == *"compute"* ]] ; then
+if [[ "$nodetype" == "worker" || "$subfunction" == *"worker"* ]] ; then
 
     if [[ "$vswitch_type" == *ovs* ]]; then
         echo    "${hostname}: OVS Info ..........: ${LOGFILE}"
diff --git a/tools/collector/scripts/collect_utils b/tools/collector/scripts/collect_utils
index 141f8334..fc8ac0a6 100755
--- a/tools/collector/scripts/collect_utils
+++ b/tools/collector/scripts/collect_utils
@@ -76,7 +76,7 @@ if [ -e ${PLATFORM_CONF} ] ; then
     source ${PLATFORM_CONF}
 fi
 
-if [ "${nodetype}" != "controller" -a "${nodetype}" != "compute" -a "${nodetype}" != "storage" ] ; then
+if [ "${nodetype}" != "controller" -a "${nodetype}" != "worker" -a "${nodetype}" != "storage" ] ; then
     logger -t ${COLLECT_TAG} "could not identify nodetype ($nodetype)"
     exit $FAIL_NODETYPE
 fi