diff --git a/src/lib/core/BUILD.gn b/src/lib/core/BUILD.gn
index d28411a92e6ca0..dd03742071afb4 100644
--- a/src/lib/core/BUILD.gn
+++ b/src/lib/core/BUILD.gn
@@ -84,7 +84,7 @@ source_set("chip_config_header") {
   allow_circular_includes_from = [ "${chip_root}/src/ble:ble_config_header" ]
 }
 
-source_set("chip_error") {
+source_set("error") {
   sources = [
     "CHIPError.cpp",
     "CHIPError.h",
@@ -136,7 +136,7 @@ static_library("core") {
 
   public_deps = [
     ":chip_config_header",
-    ":chip_error",
+    ":error",
     "${chip_root}/src/ble",
     "${chip_root}/src/inet",
     "${chip_root}/src/lib/support",
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index 81c738ef30dac6..cb6055f33376c6 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -170,7 +170,7 @@ static_library("support") {
     ":chip_version_header",
     ":logging_constants",
     "${chip_root}/src/lib/core:chip_config_header",
-    "${chip_root}/src/lib/core:chip_error",
+    "${chip_root}/src/lib/core:error",
     "${chip_root}/src/platform:platform_buildconfig",
     "${chip_root}/src/platform/logging:headers",
     "${nlassert_root}:nlassert",
diff --git a/src/system/BUILD.gn b/src/system/BUILD.gn
index fa2d3de561afbd..8882854b675f42 100644
--- a/src/system/BUILD.gn
+++ b/src/system/BUILD.gn
@@ -233,7 +233,7 @@ static_library("system") {
   cflags = [ "-Wconversion" ]
 
   public_deps = [
-    "${chip_root}/src/lib/core:chip_error",
+    "${chip_root}/src/lib/core:error",
     "${chip_root}/src/lib/support",
     "${chip_root}/src/platform:platform_buildconfig",
     "${nlassert_root}:nlassert",