diff --git a/pillar/data/addtotab.sh b/pillar/data/addtotab.sh
index 4fd4d3f8d..6352cbaec 100644
--- a/pillar/data/addtotab.sh
+++ b/pillar/data/addtotab.sh
@@ -6,7 +6,7 @@ TYPE=$1
 NAME=$2
 IPADDRESS=$3
 CPUS=$4
-UID=$5
+GUID=$5
 MANINT=$6
 MONINT=$7
 
@@ -18,7 +18,7 @@ else
   echo "    ip: $IPADDRESS" >> /opt/so/saltstack/pillar/data/$1.sls
   echo "    manint: $MANINT" >> /opt/so/saltstack/pillar/data/$1.sls
   echo "    totalcpus: $CPUS" >> /opt/so/saltstack/pillar/data/$1.sls
-  echo "    guid: $UID" >> /opt/so/saltstack/pillar/data/$1.sls
+  echo "    guid: $GUID" >> /opt/so/saltstack/pillar/data/$1.sls
   if [ $TYPE == 'sensorstab' ]; then
     echo "    monint: $MONINT" >> /opt/so/saltstack/pillar/data/$1.sls
   fi
diff --git a/pillar/data/mastertab.sls b/pillar/data/mastertab.sls
new file mode 100644
index 000000000..daf832a5f
--- /dev/null
+++ b/pillar/data/mastertab.sls
@@ -0,0 +1 @@
+mastertab: