diff --git a/perl-xCAT/xCAT/DBobjUtils.pm b/perl-xCAT/xCAT/DBobjUtils.pm
index 82dd88c9e..04ea5ed7b 100644
--- a/perl-xCAT/xCAT/DBobjUtils.pm
+++ b/perl-xCAT/xCAT/DBobjUtils.pm
@@ -1938,7 +1938,7 @@ sub getNetwkInfo
 						$nethash{$node}{$attr} = $_->{$attr};
 					}
                                 }
-                                if($nethash{$node}{'gateway'} eq '<myself>')
+                                if($nethash{$node}{'gateway'} eq '<xcatmaster>')
                                 {
                                     if(xCAT::NetworkUtils->ip_forwarding_enabled())
                                     {
diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index 4e12b9973..52d5eab2d 100644
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -433,7 +433,7 @@ networks => {
   net => 'The network address.',
   mask => 'The network mask.',
   mgtifname => 'The interface name of the management/service node facing this network.  !remote! indicates a non-local network for relay DHCP.',
-  gateway => 'The network gateway. It can be set to an ip address or the keyword <myself>, the keyword <myself> indicates the cluster-facing ip address configured on this management node or service node. Leaving this field blank means that there is no gateway for this network.',
+  gateway => 'The network gateway. It can be set to an ip address or the keyword <xcatmaster>, the keyword <xcatmaster> indicates the cluster-facing ip address configured on this management node or service node. Leaving this field blank means that there is no gateway for this network.',
   dhcpserver => 'The DHCP server that is servicing this network.  Required to be explicitly set for pooled service node operation.',
   tftpserver => 'The TFTP server that is servicing this network.  If not set, the DHCP server is assumed.',
   nameservers => 'The nameservers for this network.  Used in creating the DHCP network definition, and DNS configuration.',
diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm
index 9eed072d0..742deef77 100644
--- a/xCAT-server/lib/perl/xCAT/Postage.pm
+++ b/xCAT-server/lib/perl/xCAT/Postage.pm
@@ -880,7 +880,7 @@ sub net_parms
         my $net  = $_->{'net'};
         my $mask = $_->{'mask'};
         my $gw   = $_->{'gateway'};
-        if($gw eq '<myself>')
+        if($gw eq '<xcatmaster>')
         {
              if(xCAT::NetworkUtils->ip_forwarding_enabled())
              {
diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 4c4d6729a..371685c29 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -1533,7 +1533,7 @@ sub addnet
             {
                 $gateway = $ent->{gateway};
 
-                if ($gateway eq '<myself>')
+                if ($gateway eq '<xcatmaster>')
                 {
                     if(xCAT::NetworkUtils->ip_forwarding_enabled())
                     {
@@ -1719,7 +1719,7 @@ sub gen_aix_net
     my @netent = ( "network $net $mask\n{\n");
     if ( $gateway)
     {
-        if ($gateway eq '<myself>')
+        if ($gateway eq '<xcatmaster>')
         {
             if(xCAT::NetworkUtils->ip_forwarding_enabled())
             {
diff --git a/xCAT-server/lib/xcat/plugins/networks.pm b/xCAT-server/lib/xcat/plugins/networks.pm
index f619a8bdc..bd0849778 100644
--- a/xCAT-server/lib/xcat/plugins/networks.pm
+++ b/xCAT-server/lib/xcat/plugins/networks.pm
@@ -284,12 +284,12 @@ sub donets
                             }
                         }
 
-                        # set gateway to keyword <myself>,
+                        # set gateway to keyword <xcatmaster>,
                         # to indicate to use the cluster-facing ip address 
                         # on this management node or service node
                         if (!$gateway)
                         {
-                            $gateway = "<myself>";
+                            $gateway = "<xcatmaster>";
                         }