diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 7b54e0bfbb7d80..65c7dd866a9ae0 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -43,7 +43,7 @@ shared_library("jni") {
     "MdnsImpl.cpp",
     "MdnsImpl.h",
     "StackLock.h",
-    "gen/CHIPClusters-JNI.cpp",
+    "zap-generated/CHIPClusters-JNI.cpp",
   ]
 
   deps = [
@@ -65,7 +65,7 @@ android_library("java") {
   ]
 
   sources = [
-    "gen/ChipClusters.java",
+    "zap-generated/ChipClusters.java",
     "src/chip/devicecontroller/AndroidChipStack.java",
     "src/chip/devicecontroller/ChipClusterException.java",
     "src/chip/devicecontroller/ChipCommandType.java",
diff --git a/src/controller/java/templates/templates.json b/src/controller/java/templates/templates.json
index 1db5aaaee6265e..98f46d698939f0 100644
--- a/src/controller/java/templates/templates.json
+++ b/src/controller/java/templates/templates.json
@@ -29,12 +29,12 @@
         {
             "path": "CHIPClusters-JNI.zapt",
             "name": "CHIP ZCL API for Java (native code)",
-            "output": "src/controller/java/gen/CHIPClusters-JNI.cpp"
+            "output": "src/controller/java/zap-generated/CHIPClusters-JNI.cpp"
         },
         {
             "path": "ChipClusters-java.zapt",
             "name": "CHIP ZCL API for Java",
-            "output": "src/controller/java/gen/ChipClusters.java"
+            "output": "src/controller/java/zap-generated/ChipClusters.java"
         }
     ]
 }
diff --git a/src/controller/java/gen/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
similarity index 100%
rename from src/controller/java/gen/CHIPClusters-JNI.cpp
rename to src/controller/java/zap-generated/CHIPClusters-JNI.cpp
diff --git a/src/controller/java/gen/ChipClusters.java b/src/controller/java/zap-generated/ChipClusters.java
similarity index 100%
rename from src/controller/java/gen/ChipClusters.java
rename to src/controller/java/zap-generated/ChipClusters.java
diff --git a/src/darwin/Framework/CHIP/BUILD.gn b/src/darwin/Framework/CHIP/BUILD.gn
index 381fd179878288..d0ebe853cc10a2 100644
--- a/src/darwin/Framework/CHIP/BUILD.gn
+++ b/src/darwin/Framework/CHIP/BUILD.gn
@@ -52,8 +52,8 @@ static_library("framework") {
     "CHIPQRCodeSetupPayloadParser.mm",
     "CHIPSetupPayload.h",
     "CHIPSetupPayload.mm",
-    "gen/CHIPClustersObjc.h",
-    "gen/CHIPClustersObjc.mm",
+    "zap-generated/CHIPClustersObjc.h",
+    "zap-generated/CHIPClustersObjc.mm",
   ]
 
   public_deps = [