diff --git a/bsp-files/kickstarts/post_common.cfg b/bsp-files/kickstarts/post_common.cfg
index 1e179bc9..48abb747 100644
--- a/bsp-files/kickstarts/post_common.cfg
+++ b/bsp-files/kickstarts/post_common.cfg
@@ -69,8 +69,8 @@ for dir in /sys/class/net/*; do
     fi
 done
 
-# Mark the wrsroot password as expired immediately
-chage -d 0 wrsroot
+# Mark the sysadmin password as expired immediately
+chage -d 0 sysadmin
 
 # Lock the root password
 passwd -l root
diff --git a/inventory/inventory/inventory/common/constants.py b/inventory/inventory/inventory/common/constants.py
index d0b26f7e..a3207e8e 100644
--- a/inventory/inventory/inventory/common/constants.py
+++ b/inventory/inventory/inventory/common/constants.py
@@ -471,10 +471,10 @@ SERVICE_TYPE_BARBICAN = 'barbican'
 TIS_STD_BUILD = 'Standard'
 TIS_AIO_BUILD = 'All-in-one'
 
-# wrsroot password aging.
+# sysadmin password aging.
 # Setting aging to max defined value qualifies
 # as "never" on certain Linux distros including WRL
-WRSROOT_PASSWORD_NO_AGING = 99999
+SYSADMIN_PASSWORD_NO_AGING = 99999
 
 # Partition table size in bytes.
 PARTITION_TABLE_SIZE = 2097152
diff --git a/mtce-common/src/common/nodeBase.h b/mtce-common/src/common/nodeBase.h
index eb23ffbd..14136a26 100755
--- a/mtce-common/src/common/nodeBase.h
+++ b/mtce-common/src/common/nodeBase.h
@@ -147,7 +147,7 @@ void daemon_exit ( void );
 #define SERVER_PROFILE_DIR      ((const char *)"/etc/bmc/server_profiles.d")
 #define PASSWORD_FILE           ((const char *)"/etc/passwd")
 #define SHADOW_FILE             ((const char *)"/etc/shadow")
-#define USERNAME_ROOT           ("wrsroot")
+#define USERNAME_ROOT           ("sysadmin")
 
 #define PMON_CONF_FILE_DIR      ((const char *)"/etc/pmon.d")
 
diff --git a/mtce/src/maintenance/ipmiClient.h b/mtce/src/maintenance/ipmiClient.h
index 719daa03..2bf2beae 100644
--- a/mtce/src/maintenance/ipmiClient.h
+++ b/mtce/src/maintenance/ipmiClient.h
@@ -213,7 +213,7 @@ using namespace std;
 // #define IPMITOOL_SENSOR_OUTPUT_FILE   ((const char *)("/tmp/ipmitool_sensor_data"))
 #define IPMITOOL_SENSOR_OUTPUT_FILE   ((const char *)("/var/run/ipmitool_sensor_data"))
 #define IPMITOOL_PATH_AND_FILENAME    ((const char *)("/usr/bin/ipmitool"))
-#define IPMITOOL_PATH_AND_FILENAME_V  ((const char *)("/home/wrsroot/test/ipmitool"))
+#define IPMITOOL_PATH_AND_FILENAME_V  ((const char *)("/home/sysadmin/test/ipmitool"))
 
 #define IPMITOOL_MAX_FIELD_LEN      (64)
 
diff --git a/mtce/src/maintenance/mtcNodeHdlrs.cpp b/mtce/src/maintenance/mtcNodeHdlrs.cpp
index 6aa14f42..7829bda7 100755
--- a/mtce/src/maintenance/mtcNodeHdlrs.cpp
+++ b/mtce/src/maintenance/mtcNodeHdlrs.cpp
@@ -6115,7 +6115,7 @@ int nodeLinkClass::add_handler ( struct nodeLinkClass::node * node_ptr )
         {
             adminActionChange ( node_ptr, MTC_ADMIN_ACTION__NONE );
 
-            /* Send sysinv the wrsroot password hash
+            /* Send sysinv the sysadmin password hash
              * and aging data as an install command */
             if ( SIMPLEX && THIS_HOST &&
                 ( node_ptr->adminState == MTC_ADMIN_STATE__LOCKED ))
diff --git a/mtce/src/pmon/scripts/pmon-test.sh b/mtce/src/pmon/scripts/pmon-test.sh
index 2180f879..9b06b577 100755
--- a/mtce/src/pmon/scripts/pmon-test.sh
+++ b/mtce/src/pmon/scripts/pmon-test.sh
@@ -20,7 +20,7 @@
 #
 # process                       operation status [before pid]:[after pid]
 #
-# controller-0:~#  /home/wrsroot/pmon-test.sh restart
+# controller-0:~#  /home/sysadmin/pmon-test.sh restart
 #
 # acpid                           restart PASSED [651]:[19095]
 # fsmond                          restart PASSED [8719]:[26343]