Align naming in Ethernet Network Diagnostics cluster XML with the spec.

src/app/clusters/ethernet-network-diagnostics-server/ethernet-network-diagnostics-server.cpp

@@ -74,7 +74,7 @@ CHIP_ERROR EthernetDiagosticsAttrAccess::ReadIfSupported(CHIP_ERROR (DiagnosticD
 CHIP_ERROR EthernetDiagosticsAttrAccess::ReadPHYRate(AttributeValueEncoder & aEncoder)
 {
     Attributes::PHYRate::TypeInfo::Type pHYRate;
-    PHYRateType value = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_10_M;
+    auto value = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M;
 
     if (DeviceLayer::GetDiagnosticDataProvider().GetEthPHYRate(value) == CHIP_NO_ERROR)
     {
@@ -138,7 +138,7 @@ CHIP_ERROR EthernetDiagosticsAttrAccess::Read(const ConcreteReadAttributePath &
 
     switch (aPath.mAttributeId)
     {
-    case PHYRate::Id: {
+    case Attributes::PHYRate::Id: {
         return ReadPHYRate(aEncoder);
     }
     case FullDuplex::Id: {

src/app/common/templates/weak-enum-list.yaml

@@ -25,7 +25,7 @@
 - OnOffDelayedAllOffEffectVariant
 - OnOffDyingLightEffectVariant
 - OnOffEffectIdentifier
-- PHYRateType
+- PHYRate
 - RadioFaultType
 - RoutingRole
 - SaturationMoveMode

src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml

@@ -16,26 +16,26 @@ limitations under the License.
 -->
 <configurator>
   <domain name="CHIP"/>
-  <enum name="PHYRateType" type="ENUM8">
+  <enum name="PHYRate" type="ENUM8">
     <cluster code="0x0037"/>
-    <item name="10M" value="0x00"/>
-    <item name="100M" value="0x01"/>
-    <item name="1000M" value="0x02"/>
-    <item name="2.5G" value="0x03"/>
-    <item name="5G" value="0x04"/>
-    <item name="10G" value="0x05"/>
-    <item name="40G" value="0x06"/>
-    <item name="100G" value="0x07"/>
-    <item name="200G" value="0x08"/>
-    <item name="400G" value="0x09"/>                
+    <item name="Rate10M" value="0x00"/>
+    <item name="Rate100M" value="0x01"/>
+    <item name="Rate1G" value="0x02"/>
+    <item name="Rate2_5G" value="0x03"/>
+    <item name="Rate5G" value="0x04"/>
+    <item name="Rate10G" value="0x05"/>
+    <item name="Rate40G" value="0x06"/>
+    <item name="Rate100G" value="0x07"/>
+    <item name="Rate200G" value="0x08"/>
+    <item name="Rate400G" value="0x09"/>                
   </enum>
   <cluster>
     <domain>General</domain>
     <name>Ethernet Network Diagnostics</name>
     <code>0x0037</code>
     <define>ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER</define>
     <description>The Ethernet Network Diagnostics Cluster provides a means to acquire standardized diagnostics metrics that MAY be used by a Node to assist a user or Administrative Node in diagnosing potential problems.</description>
-    <attribute side="server" code="0x00" define="PHY_RATE" type="PHYRateType" writable="false" isNullable="true" optional="true">PHYRate</attribute>
+    <attribute side="server" code="0x00" define="PHY_RATE" type="PHYRate" writable="false" isNullable="true" optional="true">PHYRate</attribute>
     <attribute side="server" code="0x01" define="FULL_DUPLEX" type="BOOLEAN" min="0x00" max="0x01" writable="false" isNullable="true" optional="true">FullDuplex</attribute>
     <attribute side="server" code="0x02" define="PACKET_RX_COUNT" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">PacketRxCount</attribute>
     <attribute side="server" code="0x03" define="PACKET_TX_COUNT" type="INT64U" min="0x0000000000000000" max="0xFFFFFFFFFFFFFFFF" writable="false" default="0x0000000000000000" optional="true">PacketTxCount</attribute>

src/darwin/Framework/CHIP/templates/MTRBaseClusters.zapt

@@ -84,21 +84,29 @@ subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptio
 {{#*inline "enumDef"}}
 typedef NS_ENUM({{asUnderlyingZclType name}}, {{objCEnumName clusterName enumName}}) {
    {{#zcl_enum_items}}
+   {{#unless (wasRemoved ../clusterName enum=../enumName enumValue=(asUpperCamelCase label preserveAcronyms=true))}}
    {{objCEnumName ../clusterName ../enumName}}{{asUpperCamelCase label preserveAcronyms=true}} {{availability ../clusterName enum=../enumName enumValue=(asUpperCamelCase label preserveAcronyms=true) deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (asUpperCamelCase label preserveAcronyms=true))}} = {{asHex value 2}},
+   {{/unless}}
    {{#*inline "oldNameItemDecl"}}
    {{#if oldItemName}}
+   {{#unless (wasRemoved ../clusterName enum=../enumName enumValue=oldItemName)}}
    {{objCEnumName ../clusterName ../enumName}}{{objCEnumItemLabel oldItemName}} {{availability ../clusterName enum=../enumName enumValue=oldItemName deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (asUpperCamelCase label preserveAcronyms=true))}} = {{asHex value 2}},
+   {{/unless}}
    {{/if}}
    {{/inline}}
    {{> oldNameItemDecl oldItemName=(oldName ../clusterName enum=../enumName enumValue=(asUpperCamelCase label preserveAcronyms=true))}}
    {{/zcl_enum_items}}
 }
 {{/inline}}
+{{#unless (wasRemoved (asUpperCamelCase ../name preserveAcronyms=true) enum=(asUpperCamelCase label preserveAcronyms=true))}}
 {{> enumDef name=name clusterName=(asUpperCamelCase ../name preserveAcronyms=true) enumName=(asUpperCamelCase label preserveAcronyms=true)}} {{availability (asUpperCamelCase ../name preserveAcronyms=true) enum=(asUpperCamelCase label preserveAcronyms=true)}};
+{{/unless}}
 {{! Takes the name of the enum to use as enumName. }}
 {{#*inline "oldNameDecl"}}
+{{#unless (wasRemoved (compatClusterNameRemapping ../name) enum=enumName)}}
 
 {{> enumDef name=name clusterName=(compatClusterNameRemapping ../name) enumName=enumName}} {{availability (compatClusterNameRemapping ../name) enum=enumName deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../name preserveAcronyms=true) label))}};
+{{/unless}}
 {{/inline}}
 {{! Takes the old name of the enum, if any, as oldEnumName. }}
 {{#*inline "oldNameCheck"}}
@@ -118,21 +126,29 @@ typedef NS_ENUM({{asUnderlyingZclType name}}, {{objCEnumName clusterName enumNam
 {{#*inline "bitmapDef"}}
 typedef NS_OPTIONS({{asUnderlyingZclType name}}, {{objCEnumName clusterName bitmapName}}) {
    {{#zcl_bitmap_items}}
+   {{#unless (wasRemoved ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
    {{objCEnumName ../clusterName ../bitmapName}}{{asUpperCamelCase label preserveAcronyms=true}} {{availability ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true) deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (asUpperCamelCase label preserveAcronyms=true))}} = {{asHex mask}},
+   {{/unless}}
    {{#*inline "oldNameItemDecl"}}
    {{#if oldItemName}}
+   {{#unless (wasRemoved ../clusterName bitmap=../bitmapName bitmapValue=oldItemName)}}
    {{objCEnumName ../clusterName ../bitmapName}}{{objCEnumItemLabel oldItemName}} {{availability ../clusterName bitmap=../bitmapName bitmapValue=oldItemName deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../../name preserveAcronyms=true) ../label) (asUpperCamelCase label preserveAcronyms=true))}} = {{asHex mask}},
+   {{/unless}}
    {{/if}}
    {{/inline}}
    {{> oldNameItemDecl oldItemName=(oldName ../clusterName bitmap=../bitmapName bitmapValue=(asUpperCamelCase label preserveAcronyms=true))}}
    {{/zcl_bitmap_items}}
 }
 {{/inline}}
+{{#unless (wasRemoved (asUpperCamelCase ../name preserveAcronyms=true) bitmap=(asUpperCamelCase label preserveAcronyms=true))}}
 {{> bitmapDef name=name clusterName=(asUpperCamelCase ../name preserveAcronyms=true) bitmapName=(asUpperCamelCase label preserveAcronyms=true)}} {{availability (asUpperCamelCase ../name preserveAcronyms=true) bitmap=(asUpperCamelCase label preserveAcronyms=true)}};
+{{/unless}}
 {{! Takes the name of the bitmap to use as bitmapName. }}
 {{#*inline "oldNameDecl"}}
+{{#unless (wasRemoved (compatClusterNameRemapping ../name) bitmap=bitmapName)}}
 
 {{> bitmapDef name=name clusterName=(compatClusterNameRemapping ../name) bitmapName=bitmapName}} {{availability (compatClusterNameRemapping ../name) bitmap=bitmapName deprecationMessage=(concat "Please use " (objCEnumName (asUpperCamelCase ../name preserveAcronyms=true) label))}};
+{{/unless}}
 {{/inline}}
 {{! Takes the old name of the bitmap, if any, as oldBitmapName. }}
 {{#*inline "oldNameCheck"}}

src/darwin/Framework/CHIP/templates/availability.yaml

@@ -5124,6 +5124,8 @@
               - AccessControlEntryAuthModeEnum
           ThreadNetworkDiagnostics:
               - ConnectionStatusEnum
+          EthernetNetworkDiagnostics:
+              - PHYRate
       enum values:
           OTASoftwareUpdateProvider:
               OTAApplyUpdateAction:
@@ -5188,6 +5190,18 @@
               ConnectionStatusEnum:
                   - Connected
                   - NotConnected
+          EthernetNetworkDiagnostics:
+              PHYRate:
+                  - Rate10M
+                  - Rate100M
+                  - Rate1G
+                  - Rate25G
+                  - Rate5G
+                  - Rate10G
+                  - Rate40G
+                  - Rate100G
+                  - Rate200G
+                  - Rate400G
       bitmaps:
           UnitTesting:
               - Bitmap8MaskMap
@@ -5301,6 +5315,8 @@
               - AuthMode
           ThreadNetworkDiagnostics:
               - ThreadConnectionStatus
+          EthernetNetworkDiagnostics:
+              - PHYRateType
       enum values:
           GeneralCommissioning:
               CommissioningError:
@@ -5322,6 +5338,33 @@
       commands:
           BasicInformation:
               - MfgSpecificPing
+      enum values:
+          EthernetNetworkDiagnostics:
+              # Both the enum and the values got renamed, so don't output the
+              # new values with the old enum name or the old values with the
+              # new enum name.
+              PHYRateType:
+                  - Rate10M
+                  - Rate100M
+                  - Rate1G
+                  - Rate25G
+                  - Rate5G
+                  - Rate10G
+                  - Rate40G
+                  - Rate100G
+                  - Rate200G
+                  - Rate400G
+              PHYRate:
+                  - 10M
+                  - 100M
+                  - 1000M
+                  - 25G
+                  - 5G
+                  - 10G
+                  - 40G
+                  - 100G
+                  - 200G
+                  - 400G
   renames:
       clusters:
           UnitTesting: TestCluster
@@ -5397,13 +5440,38 @@
               AccessControlEntryAuthModeEnum: AuthMode
           ThreadNetworkDiagnostics:
               ConnectionStatusEnum: ThreadConnectionStatus
+          EthernetNetworkDiagnostics:
+              PHYRate: PHYRateType
       enum values:
           GeneralCommissioning:
               CommissioningError:
                   OK: Ok
           PowerSource:
               BatChargeLevel:
                   OK: Ok
+          EthernetNetworkDiagnostics:
+              PHYRate:
+                  Rate10M: 10M
+                  Rate100M: 100M
+                  Rate1G: 1000M
+                  Rate25G: 25G
+                  Rate5G: 5G
+                  Rate10G: 10G
+                  Rate40G: 40G
+                  Rate100G: 100G
+                  Rate200G: 200G
+                  Rate400G: 400G
+              PHYRateType:
+                  Rate10M: 10M
+                  Rate100M: 100M
+                  Rate1G: 1000M
+                  Rate25G: 25G
+                  Rate5G: 5G
+                  Rate10G: 10G
+                  Rate40G: 40G
+                  Rate100G: 100G
+                  Rate200G: 200G
+                  Rate400G: 400G
       bitmap values:
           NetworkCommissioning:
               WiFiSecurity:

src/include/platform/DiagnosticDataProvider.h

@@ -142,7 +142,7 @@ class DiagnosticDataProvider
     /**
      * Ethernet network diagnostics methods
      */
-    virtual CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateType & pHYRate);
+    virtual CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate);
     virtual CHIP_ERROR GetEthFullDuplex(bool & fullDuplex);
     virtual CHIP_ERROR GetEthCarrierDetect(bool & carrierDetect);
     virtual CHIP_ERROR GetEthTimeSinceReset(uint64_t & timeSinceReset);
@@ -278,7 +278,7 @@ inline CHIP_ERROR DiagnosticDataProvider::GetNetworkInterfaces(NetworkInterface
 
 inline void DiagnosticDataProvider::ReleaseNetworkInterfaces(NetworkInterface * netifp) {}
 
-inline CHIP_ERROR DiagnosticDataProvider::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateType & pHYRate)
+inline CHIP_ERROR DiagnosticDataProvider::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate)
 {
     return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
 }

src/platform/Linux/ConnectivityUtils.cpp

@@ -628,7 +628,7 @@ CHIP_ERROR ConnectivityUtils::GetEthInterfaceName(char * ifname, size_t bufSize)
     return err;
 }
 
-CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateType & pHYRate)
+CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -658,34 +658,34 @@ CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::
     switch (speed)
     {
     case 10:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_10_M;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M;
         break;
     case 100:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_100_M;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_M;
         break;
     case 1000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_1000_M;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE1_G;
         break;
     case 25000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_2__5_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE2_5_G;
         break;
     case 5000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_5_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE5_G;
         break;
     case 10000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_10_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_G;
         break;
     case 40000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_40_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE40_G;
         break;
     case 100000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_100_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_G;
         break;
     case 200000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_200_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE200_G;
         break;
     case 400000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_400_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE400_G;
         break;
     default:
         ChipLogError(DeviceLayer, "Undefined speed! (%d)\n", speed);

src/platform/Linux/ConnectivityUtils.h

@@ -53,7 +53,7 @@ class ConnectivityUtils
     static CHIP_ERROR GetWiFiBeaconLostCount(const char * ifname, uint32_t & beaconLostCount);
     static CHIP_ERROR GetWiFiCurrentMaxRate(const char * ifname, uint64_t & currentMaxRate);
     static CHIP_ERROR GetEthInterfaceName(char * ifname, size_t bufSize);
-    static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateType & pHYRate);
+    static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate);
     static CHIP_ERROR GetEthFullDuplex(const char * ifname, bool & fullDuplex);
 
 private:

src/platform/Linux/DiagnosticDataProviderImpl.cpp

@@ -512,7 +512,7 @@ void DiagnosticDataProviderImpl::ReleaseNetworkInterfaces(NetworkInterface * net
     }
 }
 
-CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateType & pHYRate)
+CHIP_ERROR DiagnosticDataProviderImpl::GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate)
 {
     if (ConnectivityMgrImpl().GetEthernetIfName() == nullptr)
     {

src/platform/Linux/DiagnosticDataProviderImpl.h

@@ -59,7 +59,7 @@ class DiagnosticDataProviderImpl : public DiagnosticDataProvider
     CHIP_ERROR GetNetworkInterfaces(NetworkInterface ** netifpp) override;
     void ReleaseNetworkInterfaces(NetworkInterface * netifp) override;
 
-    CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRateType & pHYRate) override;
+    CHIP_ERROR GetEthPHYRate(app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate) override;
     CHIP_ERROR GetEthFullDuplex(bool & fullDuplex) override;
     CHIP_ERROR GetEthTimeSinceReset(uint64_t & timeSinceReset) override;
     CHIP_ERROR GetEthPacketRxCount(uint64_t & packetRxCount) override;

src/platform/nxp/mw320/ConnectivityUtils.h

@@ -54,7 +54,7 @@ class ConnectivityUtils
     static CHIP_ERROR GetWiFiBeaconLostCount(const char * ifname, uint32_t & beaconLostCount);
     static CHIP_ERROR GetWiFiCurrentMaxRate(const char * ifname, uint64_t & currentMaxRate);
     static CHIP_ERROR GetEthInterfaceName(char * ifname, size_t bufSize);
-    //    static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateType & pHYRate);
+    //    static CHIP_ERROR GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate);
     //    static CHIP_ERROR GetEthFullDuplex(const char * ifname, bool & fullDuplex);
 
 private:

src/platform/webos/ConnectivityUtils.cpp

@@ -536,7 +536,7 @@ CHIP_ERROR ConnectivityUtils::GetEthInterfaceName(char * ifname, size_t bufSize)
     return err;
 }
 
-CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRateType & pHYRate)
+CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::EthernetNetworkDiagnostics::PHYRate & pHYRate)
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
 
@@ -566,34 +566,34 @@ CHIP_ERROR ConnectivityUtils::GetEthPHYRate(const char * ifname, app::Clusters::
     switch (speed)
     {
     case 10:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_10_M;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_M;
         break;
     case 100:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_100_M;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_M;
         break;
     case 1000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_1000_M;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE1_G;
         break;
     case 25000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_2__5_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE2_5_G;
         break;
     case 5000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_5_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE5_G;
         break;
     case 10000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_10_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE10_G;
         break;
     case 40000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_40_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE40_G;
         break;
     case 100000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_100_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE100_G;
         break;
     case 200000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_200_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE200_G;
         break;
     case 400000:
-        pHYRate = EmberAfPHYRateType::EMBER_ZCL_PHY_RATE_TYPE_400_G;
+        pHYRate = EmberAfPHYRate::EMBER_ZCL_PHY_RATE_RATE400_G;
         break;
     default:
         ChipLogError(DeviceLayer, "Undefined speed! (%d)\n", speed);