diff --git a/SAS/QPIDInfrastructure/bin/populateDB.sh b/SAS/QPIDInfrastructure/bin/populateDB.sh
index be19626bd87c67a70bce85299e369060ea16749b..dea9d87798d4382fc4393f760d6e2b8533f00597 100755
--- a/SAS/QPIDInfrastructure/bin/populateDB.sh
+++ b/SAS/QPIDInfrastructure/bin/populateDB.sh
@@ -37,7 +37,7 @@ if $PROD; then
   SCU=scu001.control.lofar
   SAS=sas001.control.lofar
 
-  MOM_USER=lcs023.control.lofar
+  MOM_SYSTEM=lcs023.control.lofar
   MOM_INGEST=lcs029.control.lofar
 
   COBALT="`seq -f cbm%03.0f.control.lofar 1 8`"
@@ -53,7 +53,7 @@ else
   SCU=scu099.control.lofar
   SAS=sas099.control.lofar
 
-  MOM_USER=lcs028.control.lofar
+  MOM_SYSTEM=lcs028.control.lofar
   MOM_INGEST=lcs028.control.lofar
 
   COBALT="cbm009.control.lofar"
@@ -117,9 +117,9 @@ done
 #   MessageRouter -> MoM
 # -----------------------------------------
 
-addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.dataproducts --federation $MOM_USER
-addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.processing --federation $MOM_USER
-addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.state --federation $MOM_USER
+addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.dataproducts --federation $MOM_SYSTEM
+addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.processing --federation $MOM_SYSTEM
+addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.feedback.state --federation $MOM_SYSTEM
 
 # -----------------------------------------
 #   MessageRouter -> OTDB
@@ -139,31 +139,31 @@ addtoQPIDDB.py --broker $CCU --exchange ${PREFIX}mac.task.feedback.state
 # -----------------------------------------
 
 addtoQPIDDB.py --broker $MCU --queue ${PREFIX}lofar.task.specification.system --federation $CCU
-addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.specification.system --federation $MOM_USER
+addtoQPIDDB.py --broker $CCU --queue ${PREFIX}mom.task.specification.system --federation $MOM_SYSTEM
 
 # -----------------------------------------
 #   MoM <-> MoM-OTDB-Adapter
 # -----------------------------------------
 
-addtoQPIDDB.py --broker $SAS --queue mom.command --federation $MOM_USER
-addtoQPIDDB.py --broker $SAS --queue mom.importxml --federation $MOM_USER
-addtoQPIDDB.py --broker $MOM_USER --queue mom-otdb-adapter.importxml --federation $SAS
+addtoQPIDDB.py --broker $SAS --queue mom.command --federation $MOM_SYSTEM
+addtoQPIDDB.py --broker $SAS --queue mom.importxml --federation $MOM_SYSTEM
+addtoQPIDDB.py --broker $MOM_SYSTEM --queue mom-otdb-adapter.importxml --federation $SAS
 
 # -----------------------------------------
 #   MoM Services
 # -----------------------------------------
-addtoQPIDDB.py --broker $MOM_USER --exchange ${PREFIX}lofar.mom.bus
+addtoQPIDDB.py --broker $MOM_SYSTEM --exchange ${PREFIX}lofar.mom.bus
 addtoQPIDDB.py --broker $MOM_INGEST --exchange ${PREFIX}lofar.mom.bus
-addtoQPIDDB.py --broker $MOM_USER --exchange ${PREFIX}lofar.mom.command
-addtoQPIDDB.py --broker $MOM_USER --exchange ${PREFIX}lofar.mom.notification
+addtoQPIDDB.py --broker $MOM_SYSTEM --exchange ${PREFIX}lofar.mom.command
+addtoQPIDDB.py --broker $MOM_SYSTEM --exchange ${PREFIX}lofar.mom.notification
 
 # -----------------------------------------
 #   MoM Services <-> ResourceAssignment
 # -----------------------------------------
 
-addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.mom.bus --federation $MOM_USER
-addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.mom.command --federation $MOM_USER
-addtoQPIDDB.py --broker $MOM_USER --exchange ${PREFIX}lofar.mom.notification --federation $SCU
+addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.mom.bus --federation $MOM_SYSTEM
+addtoQPIDDB.py --broker $SCU --exchange ${PREFIX}lofar.mom.command --federation $MOM_SYSTEM
+addtoQPIDDB.py --broker $MOM_SYSTEM --exchange ${PREFIX}lofar.mom.notification --federation $SCU
 
 # -----------------------------------------
 #   ResourceAssignment