diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn
index 0952ff7ec5402b..199c996a73850a 100644
--- a/src/app/BUILD.gn
+++ b/src/app/BUILD.gn
@@ -91,7 +91,7 @@ static_library("app") {
     "ReadClient.cpp",
     "ReadHandler.cpp",
     "decoder.cpp",
-    "encoder.cpp",
+    "encoder-common.cpp",
     "reporting/Engine.cpp",
     "reporting/Engine.h",
   ]
diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni
index a15483cf1b79f7..d35a180ef8845a 100644
--- a/src/app/chip_data_model.gni
+++ b/src/app/chip_data_model.gni
@@ -93,7 +93,7 @@ template("chip_data_model") {
       "${_app_root}/clusters/zll-level-control-server/zll-level-control-server.h",
       "${_app_root}/clusters/zll-on-off-server/zll-on-off-server.h",
       "${_app_root}/clusters/zll-scenes-server/zll-scenes-server.h",
-      "${_app_root}/encoder.cpp",
+      "${_app_root}/encoder-common.cpp",
       "${_app_root}/reporting/reporting-default-configuration.cpp",
       "${_app_root}/reporting/reporting-tokens.h",
       "${_app_root}/reporting/reporting.cpp",
@@ -102,7 +102,7 @@ template("chip_data_model") {
       "${_app_root}/util/af-event.cpp",
       "${_app_root}/util/af-main-common.cpp",
       "${_app_root}/util/attribute-list-byte-span.cpp",
-      "${_app_root}/util/attribute-size.cpp",
+      "${_app_root}/util/attribute-size-util.cpp",
       "${_app_root}/util/attribute-storage.cpp",
       "${_app_root}/util/attribute-table.cpp",
       "${_app_root}/util/binding-table.cpp",
diff --git a/src/app/encoder.cpp b/src/app/encoder-common.cpp
similarity index 100%
rename from src/app/encoder.cpp
rename to src/app/encoder-common.cpp
diff --git a/src/app/util/attribute-size.cpp b/src/app/util/attribute-size-util.cpp
similarity index 100%
rename from src/app/util/attribute-size.cpp
rename to src/app/util/attribute-size-util.cpp