diff --git a/src/app/codegen-interaction-model/CodegenDataModel.cpp b/src/app/codegen-interaction-model/CodegenDataModel.cpp
index 2f65f09c53fd8f..f917a8e9c9c4b0 100644
--- a/src/app/codegen-interaction-model/CodegenDataModel.cpp
+++ b/src/app/codegen-interaction-model/CodegenDataModel.cpp
@@ -79,7 +79,7 @@ InteractionModel::ClusterEntry FirstServerClusterEntry(EndpointId endpointId, co
     for (unsigned cluster_idx = start_index; cluster_idx < endpoint->clusterCount; cluster_idx++)
     {
         const EmberAfCluster & cluster = endpoint->cluster[cluster_idx];
-        if (!cluster.IsServerMask())
+        if (!cluster.IsServer())
         {
             continue;
         }
@@ -330,7 +330,7 @@ std::optional<unsigned> CodegenDataModel::TryFindServerClusterIndex(const EmberA
     if (mClusterIterationHint < clusterCount)
     {
         const EmberAfCluster & cluster = endpoint->cluster[mClusterIterationHint];
-        if (cluster.IsServerMask() && (cluster.clusterId == id))
+        if (cluster.IsServer() && (cluster.clusterId == id))
         {
             return std::make_optional(mClusterIterationHint);
         }
@@ -342,7 +342,7 @@ std::optional<unsigned> CodegenDataModel::TryFindServerClusterIndex(const EmberA
     for (unsigned cluster_idx = 0; cluster_idx < clusterCount; cluster_idx++)
     {
         const EmberAfCluster & cluster = endpoint->cluster[cluster_idx];
-        if (cluster.IsServerMask() && (cluster.clusterId == id))
+        if (cluster.IsServer() && (cluster.clusterId == id))
         {
             return std::make_optional(cluster_idx);
         }
diff --git a/src/app/util/af-types.h b/src/app/util/af-types.h
index 4509803561d9a3..929ad055d0fc1e 100644
--- a/src/app/util/af-types.h
+++ b/src/app/util/af-types.h
@@ -118,7 +118,7 @@ struct EmberAfCluster
      */
     uint16_t eventCount;
 
-    bool IsServerMask() const { return (mask & CLUSTER_MASK_SERVER) != 0; }
+    bool IsServer() const { return (mask & CLUSTER_MASK_SERVER) != 0; }
 };
 
 /**