diff --git a/docs/source/advanced/networks/edgecore_switches/onie_switches.rst b/docs/source/advanced/networks/edgecore_switches/onie_switches.rst
index dd41a8c71..ba079c23c 100644
--- a/docs/source/advanced/networks/edgecore_switches/onie_switches.rst
+++ b/docs/source/advanced/networks/edgecore_switches/onie_switches.rst
@@ -49,9 +49,9 @@ Enable the passwordless ssh for "root"
 
 In a newly installed Cumulus OS, a default user ``cumulus`` will be created, the switch can be accessed via ssh with the default password ``CumulusLinux!``. 
 
-The passwordless ssh access of "root" should be enabled with the script ``/opt/xcat/share/xcat/scripts/configcumulus`` ::
+The passwordless ssh access of "root" should be enabled with the script ``/opt/xcat/share/xcat/scripts/configonie`` ::
 
-    /opt/xcat/share/xcat/scripts/configcumulus --switches edgecoresw1 --ssh
+    /opt/xcat/share/xcat/scripts/configonie --switches edgecoresw1 --ssh
 
 After the passwordless access for "root" is setup successfully, the switch can be managed with the node management commands such as ``xdsh``, ``xdcp`` and ``updatenode``, etc.
  
diff --git a/xCAT-server/lib/xcat/plugins/switchdiscover.pm b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
index 1b90ea155..4966a24ff 100644
--- a/xCAT-server/lib/xcat/plugins/switchdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/switchdiscover.pm
@@ -37,7 +37,7 @@ my %global_mac_identity = (
     "6c:ae:8b" => "BNT G8264-T switch",
     "fc:cf:62" => "BNT G8124 switch",
     "7c:fe:90" => "Mellanox IB switch",
-    "8c:ea:1b" => "Edgecore switch"
+    "8c:ea:1b" => "Edgecore Networks Switch"
 );
 
 my %global_switch_type = (
@@ -53,7 +53,7 @@ my %global_switch_type = (
     mellanox => "Mellanox",
     MLNX => "Mellanox",
     MELLAN => "Mellanox",
-    Edgecore => "cumulus"
+    Edgecore => "onie"
 );
 
 
@@ -1440,8 +1440,8 @@ sub switchsetup {
         my $config_script = "$::XCATROOT/share/xcat/scripts/config".$mytype;
         if (-r -x $config_script) {
             my $switches = join(",",@{${nodes_to_config}->{$mytype}});
-            if ($mytype eq "cumulus") {
-                send_msg($request, 0, "Cumulus switch needs to take 50 mins to install, please run /opt/xcat/share/xcat/script/configcumulus after cumulus OS installed on switch\n");
+            if ($mytype eq "onie") {
+                send_msg($request, 0, "onie switch needs to take 50 mins to install, please run /opt/xcat/share/xcat/script/configonie after Cumulus OS installed on switch\n");
             } else {
                 send_msg($request, 0, "call to config $mytype switches $switches\n");
                 my $out = `$config_script --switches $switches --all`;
diff --git a/xCAT-server/share/xcat/scripts/configcumulus b/xCAT-server/share/xcat/scripts/configonie
similarity index 96%
rename from xCAT-server/share/xcat/scripts/configcumulus
rename to xCAT-server/share/xcat/scripts/configonie
index f746bd81a..3aa2ed2ac 100755
--- a/xCAT-server/share/xcat/scripts/configcumulus
+++ b/xCAT-server/share/xcat/scripts/configonie
@@ -384,14 +384,14 @@ sub config_ntp {
 sub usage
 {
     print "Usage:
-    configcumulus -h│--help 
-    configcumulus --switches switchnames --ssh 
-    configcumulus --switches switchnames --license filename  
-    configcumulus --switches switchnames --snmp [--user snmp_user] [--password snmp_password] [--group snmp_group]
-    configcumulus --switches switchnames --ntp 
+    configonie -h│--help 
+    configonie --switches switchnames --ssh 
+    configonie --switches switchnames --license filename  
+    configonie --switches switchnames --snmp [--user snmp_user] [--password snmp_password] [--group snmp_group]
+    configonie --switches switchnames --ntp 
 
     To set ssh, install license(license file: /root/license.txt), config snmp and ntp:
-        configcumulus --switches switchnames --all 
+        configonie --switches switchnames --all 
     \n";
 }