diff --git a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml
index d6c7adf1e5dccc..3c4cde3bf3e159 100644
--- a/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml
+++ b/src/app/zap-templates/zcl/data-model/chip/unit-localization-cluster.xml
@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <configurator>
   <domain name="CHIP" />
-  <enum name="TempUnit" type="ENUM8">
+  <enum name="TempUnitEnum" type="ENUM8">
     <cluster code="0x002d"/>
     <item name="Fahrenheit" value="0x00"/>
     <item name="Celsius" value="0x01"/>
@@ -35,7 +35,7 @@ limitations under the License.
       mechanism by which they can be configured to use a user’s preferred unit.</description>
     <globalAttribute side="either" code="0xFFFD" value="1"/>
     <!-- Base data types -->
-    <attribute side="server" code="0x00" define="TEMPERATURE_UNIT" type="TempUnit" min="0" max="2" writable="true" optional="true">TemperatureUnit</attribute>
+    <attribute side="server" code="0x00" define="TEMPERATURE_UNIT" type="TempUnitEnum" min="0" max="2" writable="true" optional="true">TemperatureUnit</attribute>
   </cluster>
   <bitmap name="UnitLocalizationFeature" type="BITMAP32">
     <cluster code="0x002d"/>
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
index 3e0a06643b259b..f1d94687b2010f 100644
--- a/src/darwin/Framework/CHIP/templates/availability.yaml
+++ b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -3066,7 +3066,10 @@
               - CalendarType
               - HourFormat
           UnitLocalization:
-              - TempUnit
+              # TempUnitEnum was originally just named TempUnit, but
+              # we generate the same API for both of those names, so the name
+              # can just change here.
+              - TempUnitEnum
           PowerSource:
               - BatChargeFault
               - BatChargeLevel
@@ -3335,7 +3338,10 @@
                   - 12hr
                   - 24hr
           UnitLocalization:
-              TempUnit:
+              # TempUnitEnum was originally just named TempUnit, but
+              # we generate the same API for both of those names, so the name
+              # can just change here.
+              TempUnitEnum:
                   - Fahrenheit
                   - Celsius
                   - Kelvin