diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index 5e82ccd..7e9cfd8 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -692,7 +692,7 @@
 };
 
 struct chip_operations northbridge_amd_pi_00730F01_ops = {
-	CHIP_NAME("AMD FAM16 Root Complex")
+	.name = "AMD FAM16 Root Complex",
 	.final = fam16_finalize,
 };
 
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index 65a0212..fa29ef5 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -70,5 +70,5 @@
 };
 
 struct chip_operations northbridge_intel_e7505_ops = {
-	CHIP_NAME("Intel E7505 Northbridge")
+	.name = "Intel E7505 Northbridge",
 };
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index 4bddf20..50d0d89 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -233,7 +233,7 @@
 }
 
 struct chip_operations northbridge_intel_gm45_ops = {
-	CHIP_NAME("Intel GM45 Northbridge")
+	.name = "Intel GM45 Northbridge",
 	.init = gm45_init,
 };
 
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index ef5b9e9..c544ad3 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -542,5 +542,5 @@
 };
 
 struct chip_operations northbridge_intel_haswell_ops = {
-	CHIP_NAME("Intel Haswell integrated Northbridge")
+	.name = "Intel Haswell integrated Northbridge",
 };
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index 0670f72..d588197 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -105,6 +105,6 @@
 }
 
 struct chip_operations northbridge_intel_i440bx_ops = {
-	CHIP_NAME("Intel 82443BX (440BX) Northbridge")
+	.name = "Intel 82443BX (440BX) Northbridge",
 	.enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 1dfcc40..34ebcb2 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -134,7 +134,7 @@
 };
 
 struct chip_operations northbridge_intel_i945_ops = {
-	CHIP_NAME("Intel i945 Northbridge")
+	.name = "Intel i945 Northbridge",
 };
 
 bool northbridge_support_slfm(void)
diff --git a/src/northbridge/intel/ironlake/northbridge.c b/src/northbridge/intel/ironlake/northbridge.c
index 74ddee2..e6bc375 100644
--- a/src/northbridge/intel/ironlake/northbridge.c
+++ b/src/northbridge/intel/ironlake/northbridge.c
@@ -217,6 +217,6 @@
 };
 
 struct chip_operations northbridge_intel_ironlake_ops = {
-	CHIP_NAME("Intel Ironlake integrated Northbridge")
+	.name = "Intel Ironlake integrated Northbridge",
 	.init = ironlake_init,
 };
diff --git a/src/northbridge/intel/pineview/northbridge.c b/src/northbridge/intel/pineview/northbridge.c
index a23a0d5..d7a6c84 100644
--- a/src/northbridge/intel/pineview/northbridge.c
+++ b/src/northbridge/intel/pineview/northbridge.c
@@ -159,6 +159,6 @@
 }
 
 struct chip_operations northbridge_intel_pineview_ops = {
-	CHIP_NAME("Intel Pineview Northbridge")
+	.name = "Intel Pineview Northbridge",
 	.enable_dev = enable_dev,
 };
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index 6b89710..3db9086 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -407,5 +407,5 @@
 };
 
 struct chip_operations northbridge_intel_sandybridge_ops = {
-	CHIP_NAME("Intel SandyBridge/IvyBridge integrated Northbridge")
+	.name = "Intel SandyBridge/IvyBridge integrated Northbridge",
 };
diff --git a/src/northbridge/intel/x4x/northbridge.c b/src/northbridge/intel/x4x/northbridge.c
index 12a7a40..b037cf8 100644
--- a/src/northbridge/intel/x4x/northbridge.c
+++ b/src/northbridge/intel/x4x/northbridge.c
@@ -154,7 +154,7 @@
 }
 
 struct chip_operations northbridge_intel_x4x_ops = {
-	CHIP_NAME("Intel 4-Series Northbridge")
+	.name = "Intel 4-Series Northbridge",
 	.init = x4x_init,
 };