diff --git a/sbin/dm_backup.sh b/sbin/dm_backup.sh
index 7e55ee864775a474b6c75bb76482154a7b01ae9f..be2528173c80487fdae47102abca02421a6d1bf7 100755
--- a/sbin/dm_backup.sh
+++ b/sbin/dm_backup.sh
@@ -114,7 +114,7 @@ rm -f $processingFile
 
 # Backup web app
 #echo "Backing up $DM_DB_NAME web app"
-#rsync -arlvP $DM_SUPPORT_DIR/opt/glassfish/glassfish/domains/domain1/autodeploy/$DM_DB_NAME.war $DM_BACKUP_DIR
+#rsync -arlvP $DM_SUPPORT_DIR/opt/payara/glassfish/domains/domain1/autodeploy/$DM_DB_NAME.war $DM_BACKUP_DIR
 
 cleanup
 echo "Backup of DB $DM_DB_NAME is done."
diff --git a/sbin/dm_configure_web_portal.sh b/sbin/dm_configure_web_portal.sh
index fa25a14f04c2e1858278be2895befaceefe5d491..ba0b31058bc29775a4743e7a308cec880e07c867 100755
--- a/sbin/dm_configure_web_portal.sh
+++ b/sbin/dm_configure_web_portal.sh
@@ -42,10 +42,10 @@ DM_SYSTEM_PASSWORD_FILE=${DM_INSTALL_DIR}/etc/${DM_SYSTEM_USER}.system.passwd
 DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
 
 JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
-GLASSFISH_DIR=$DM_OPT_DIR/glassfish
+PAYARA_DIR=$DM_OPT_DIR/payara
 
 export AS_JAVA=$JAVA_HOME
-ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin 
+ASADMIN_CMD=$PAYARA_DIR/bin/asadmin 
 
 DM_DB_HOST=${DM_DB_HOST:=localhost}
 DM_DB_PORT=${DM_DB_PORT:=11136}
@@ -57,7 +57,7 @@ DM_DOMAIN=domain1
 
 # copy db driver
 echo "Copying db driver"
-rsync -ar $DM_ROOT_DIR/src/java/DmWebPortal/lib/postgresql*.jdbc41.jar $GLASSFISH_DIR/glassfish/domains/${DM_DOMAIN}/lib/ext
+rsync -ar $DM_ROOT_DIR/src/java/DmWebPortal/lib/postgresql*.jdbc41.jar $PAYARA_DIR/glassfish/domains/${DM_DOMAIN}/lib/ext
 
 # Check password from file
 passwordFile=$DM_INSTALL_DIR/etc/$DM_DB_NAME.db.passwd
@@ -66,7 +66,7 @@ if [ -f $passwordFile ]; then
 fi
 
 # restart server
-echo "Restarting glassfish"
+echo "Restarting payara"
 $ASADMIN_CMD stop-domain ${DM_DOMAIN}
 $ASADMIN_CMD start-domain ${DM_DOMAIN}
 
diff --git a/sbin/dm_deploy_web_portal.sh b/sbin/dm_deploy_web_portal.sh
index 394b48759bfbd846b2b58b0135f494168080ba44..24f51257fc021afc9930b6d682ce8f7b988b6029 100755
--- a/sbin/dm_deploy_web_portal.sh
+++ b/sbin/dm_deploy_web_portal.sh
@@ -42,8 +42,8 @@ DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
 DM_HOSTNAME=`hostname -f`
 DM_DATE=`date +%Y.%m.%d`
 DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
-GLASSFISH_DIR=$DM_OPT_DIR/glassfish
-DM_DEPLOY_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/autodeploy
+PAYARA_DIR=$DM_OPT_DIR/payara
+DM_DEPLOY_DIR=$PAYARA_DIR/glassfish/domains/domain1/autodeploy
 DM_PORTAL_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist
 DM_BASE_DIST_DIR=$DM_ROOT_DIR/src/java/DmBase/dist
 DM_API_DIST_DIR=$DM_ROOT_DIR/src/java/DmApi/dist
@@ -116,7 +116,7 @@ cd ../..
 jar cf ../$DM_WAR_FILE *
 
 export AS_JAVA=$JAVA_HOME
-ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin
+ASADMIN_CMD=$PAYARA_DIR/bin/asadmin
 
 # copy war file
 echo "Copying war file $DM_PORTAL_DIST_DIR/$DM_WAR_FILE to $DM_DEPLOY_DIR"
diff --git a/sbin/dm_unconfigure_web_portal.sh b/sbin/dm_unconfigure_web_portal.sh
index de8836c9580d5060eba82d283a79bb5e02ab7f80..99d3ba7e4d98d9dea2ea8e4396fd70bd90339ac5 100755
--- a/sbin/dm_unconfigure_web_portal.sh
+++ b/sbin/dm_unconfigure_web_portal.sh
@@ -39,17 +39,17 @@ fi
 
 DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
 JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
-GLASSFISH_DIR=$DM_OPT_DIR/glassfish
+PAYARA_DIR=$DM_OPT_DIR/payara
 
 export AS_JAVA=$JAVA_HOME
-ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin 
+ASADMIN_CMD=$PAYARA_DIR/bin/asadmin 
 
 DM_DB_POOL=postgresql_${DM_DB_NAME}_DbPool
 DM_DATA_SOURCE=${DM_DB_NAME}_DataSource
 DM_DOMAIN=domain1
 
 # restart server
-echo "Restarting glassfish"
+echo "Restarting payara"
 $ASADMIN_CMD stop-domain ${DM_DOMAIN}
 $ASADMIN_CMD start-domain ${DM_DOMAIN}
 
diff --git a/sbin/dm_undeploy_web_portal.sh b/sbin/dm_undeploy_web_portal.sh
index cf7f9069f17a3e5f8f023cad5569ee43bf3480b3..1efdd8458b0dd835b4b31b30ec79b77868c5980c 100755
--- a/sbin/dm_undeploy_web_portal.sh
+++ b/sbin/dm_undeploy_web_portal.sh
@@ -40,14 +40,14 @@ fi
 DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
 DM_CONTEXT_ROOT=${DM_CONTEXT_ROOT:=dm}
 JAVA_HOME=$DM_OPT_DIR/java/$DM_HOST_ARCH
-GLASSFISH_DIR=$DM_OPT_DIR/glassfish
-DM_DEPLOY_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/autodeploy
-DM_APP_DIR=$GLASSFISH_DIR/glassfish/domains/domain1/applications/$DM_CONTEXT_ROOT
+PAYARA_DIR=$DM_OPT_DIR/payara
+DM_DEPLOY_DIR=$PAYARA_DIR/glassfish/domains/domain1/autodeploy
+DM_APP_DIR=$PAYARA_DIR/glassfish/domains/domain1/applications/$DM_CONTEXT_ROOT
 DM_DIST_DIR=$DM_ROOT_DIR/src/java/DmWebPortal/dist
 DM_WAR_FILE=$DM_CONTEXT_ROOT.war
 
 export AS_JAVA=$JAVA_HOME
-ASADMIN_CMD=$GLASSFISH_DIR/bin/asadmin
+ASADMIN_CMD=$PAYARA_DIR/bin/asadmin
 
 # remove war file from autodeploy directory
 echo "Removing war file $DM_DEPLOY_DIR/$DM_WAR_FILE"
@@ -62,7 +62,7 @@ else
 fi
 
 # restart server
-echo "Restarting glassfish"
+echo "Restarting payara"
 $ASADMIN_CMD stop-domain ${DM_DOMAIN}
 $ASADMIN_CMD start-domain ${DM_DOMAIN}
 
diff --git a/setup.csh b/setup.csh
index 31559cec269b91e522fe28f18d68bb35016ce2ac..b8e5abd586fd96d392329b038bfb79e2729e575c 100644
--- a/setup.csh
+++ b/setup.csh
@@ -44,7 +44,7 @@ if ( ! -d $DM_SUPPORT_DIR ) then
     exit 1
 endif
 setenv DM_OPT_DIR $DM_SUPPORT_DIR/opt
-setenv DM_GLASSFISH_DIR $DM_OPT_DIR/glassfish
+setenv DM_GLASSFISH_DIR $DM_OPT_DIR/payara
 
 # Setup path and other variables
 setenv PATH ${DM_OPT_DIR}/node/bin:${PATH}
diff --git a/setup.sh b/setup.sh
index 99755495e427e48fcf7f81b3ca9ff031a1e1250a..6b09cf9ea215e4ae3ccac29f6dae702fabefb134 100644
--- a/setup.sh
+++ b/setup.sh
@@ -42,7 +42,7 @@ if [ ! -d $DM_SUPPORT_DIR ]; then
     return 1
 fi
 export DM_OPT_DIR=$DM_SUPPORT_DIR/opt
-export DM_GLASSFISH_DIR=$DM_OPT_DIR/glassfish
+export DM_GLASSFISH_DIR=$DM_OPT_DIR/payara
 
 
 # Add to path only if directory exists.