diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
index b4aa4e1bba5a83..615dbceadcdf57 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
@@ -17165,10 +17165,10 @@ MTR_DEPRECATED("Please use MTRBaseClusterUnitTesting", ios(16.1, 16.4), macos(13
 @interface MTRBaseClusterTestCluster : MTRBaseClusterUnitTesting
 @end
 
-typedef NS_ENUM(uint8_t, MTRGlobalsTestGlobal) {
-    MTRGlobalsTestGlobalSomeValue MTR_PROVISIONALLY_AVAILABLE = 0x00,
-    MTRGlobalsTestGlobalSomeOtherValue MTR_PROVISIONALLY_AVAILABLE = 0x01,
-    MTRGlobalsTestGlobalFinalValue MTR_PROVISIONALLY_AVAILABLE = 0x02,
+typedef NS_ENUM(uint8_t, MTRDataTypeTestGlobalEnum) {
+    MTRDataTypeTestGlobalEnumSomeValue MTR_PROVISIONALLY_AVAILABLE = 0x00,
+    MTRDataTypeTestGlobalEnumSomeOtherValue MTR_PROVISIONALLY_AVAILABLE = 0x01,
+    MTRDataTypeTestGlobalEnumFinalValue MTR_PROVISIONALLY_AVAILABLE = 0x02,
 } MTR_PROVISIONALLY_AVAILABLE;
 
 typedef NS_ENUM(uint8_t, MTRIdentifyEffectIdentifier) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
index 477da254447cd3..94a6b90dfeac88 100644
--- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
@@ -19,7 +19,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@implementation MTRGlobalsClusterTestGlobalStruct
+@implementation MTRDataTypeTestGlobalStruct
 - (instancetype)init
 {
     if (self = [super init]) {
@@ -35,7 +35,7 @@ - (instancetype)init
 
 - (id)copyWithZone:(NSZone * _Nullable)zone
 {
-    auto other = [[MTRGlobalsClusterTestGlobalStruct alloc] init];
+    auto other = [[MTRDataTypeTestGlobalStruct alloc] init];
 
     other.name = self.name;
     other.myBitmap = self.myBitmap;
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
index 25cfe8bfe38f0a..7da70886dfdee8 100644
--- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
+++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
@@ -335,8 +335,8 @@ struct Type
 {
 public:
     chip::CharSpan name;
-    DataModel::Nullable<chip::BitMask<TestGlobalBitmap>> myBitmap;
-    Optional<DataModel::Nullable<TestGlobalEnum>> myEnum;
+    DataModel::Nullable<chip::BitMask<Globals::TestGlobalBitmap>> myBitmap;
+    Optional<DataModel::Nullable<Globals::TestGlobalEnum>> myEnum;
 
     CHIP_ERROR Decode(TLV::TLVReader & reader);