diff --git a/src/board/system76/addw1/board.mk b/src/board/system76/addw1/board.mk
index 91bfea4..d735f7f 100644
--- a/src/board/system76/addw1/board.mk
+++ b/src/board/system76/addw1/board.mk
@@ -34,23 +34,24 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/addw2/board.mk b/src/board/system76/addw2/board.mk
index ca256cb..69fe5e3 100644
--- a/src/board/system76/addw2/board.mk
+++ b/src/board/system76/addw2/board.mk
@@ -34,23 +34,24 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/addw3/board.mk b/src/board/system76/addw3/board.mk
index 524d5ad..5231001 100644
--- a/src/board/system76/addw3/board.mk
+++ b/src/board/system76/addw3/board.mk
@@ -43,27 +43,28 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=55
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/addw4/board.mk b/src/board/system76/addw4/board.mk
index 29bc9de..310be1e 100644
--- a/src/board/system76/addw4/board.mk
+++ b/src/board/system76/addw4/board.mk
@@ -39,31 +39,32 @@ CFLAGS += \
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS += -DBOARD_HEATUP=5
-CFLAGS += -DBOARD_COOLDOWN=20
-CFLAGS += -DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 28), \
 	FAN_POINT(65, 28), \
 	FAN_POINT(70, 40), \
 	FAN_POINT(75, 60), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Enable DGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS += -DBOARD_DGPU_HEATUP=5
-CFLAGS += -DBOARD_DGPU_COOLDOWN=20
-CFLAGS += -DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 28), \
 	FAN_POINT(65, 28), \
 	FAN_POINT(70, 40), \
 	FAN_POINT(75, 60), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/bonw14/board.mk b/src/board/system76/bonw14/board.mk
index ab86422..d3099ea 100644
--- a/src/board/system76/bonw14/board.mk
+++ b/src/board/system76/bonw14/board.mk
@@ -34,23 +34,24 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/bonw15/board.mk b/src/board/system76/bonw15/board.mk
index d2163bf..7fc4229 100644
--- a/src/board/system76/bonw15/board.mk
+++ b/src/board/system76/bonw15/board.mk
@@ -48,27 +48,28 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=55
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/common/fan.c b/src/board/system76/common/fan.c
index dfabde8..9fdbaf6 100644
--- a/src/board/system76/common/fan.c
+++ b/src/board/system76/common/fan.c
@@ -10,8 +10,8 @@
 
 bool fan_max = false;
 
-static uint8_t last_duty_dgpu = 0;
-static uint8_t last_duty_peci = 0;
+static uint8_t last_fan1_duty = 0;
+static uint8_t last_fan2_duty = 0;
 
 #define FAN_POINT(T, D) { .temp = (int16_t)(T), .duty = PWM_DUTY(D) }
 
@@ -26,29 +26,29 @@ static uint8_t last_duty_peci = 0;
 #define MIN_SPEED_TO_SMOOTH PWM_DUTY(SMOOTH_FANS_MIN)
 
 // Fan speed is the lowest requested over HEATUP seconds
-#ifndef BOARD_HEATUP
-#define BOARD_HEATUP 4
+#ifndef BOARD_FAN1_HEATUP
+#define BOARD_FAN1_HEATUP 4
 #endif
 
-static uint8_t FAN1_HEATUP[BOARD_HEATUP] = { 0 };
+static uint8_t FAN1_HEATUP[BOARD_FAN1_HEATUP] = { 0 };
 
 // Fan speed is the highest HEATUP speed over COOLDOWN seconds
-#ifndef BOARD_COOLDOWN
-#define BOARD_COOLDOWN 10
+#ifndef BOARD_FAN1_COOLDOWN
+#define BOARD_FAN1_COOLDOWN 10
 #endif
 
-static uint8_t FAN1_COOLDOWN[BOARD_COOLDOWN] = { 0 };
+static uint8_t FAN1_COOLDOWN[BOARD_FAN1_COOLDOWN] = { 0 };
 
 // Fan curve with temperature in degrees C, duty cycle in percent
 static struct FanPoint __code FAN1_POINTS[] = {
-#ifdef BOARD_FAN_POINTS
-    BOARD_FAN_POINTS
+#ifdef BOARD_FAN1_POINTS
+    BOARD_FAN1_POINTS
 #else
     FAN_POINT(70, 40),
     FAN_POINT(75, 50),
     FAN_POINT(80, 60),
     FAN_POINT(85, 65),
-    FAN_POINT(90, 65)
+    FAN_POINT(90, 65),
 #endif
 };
 
@@ -65,29 +65,29 @@ static struct Fan __code FAN1 = {
 #if CONFIG_HAVE_DGPU
 
 // Fan speed is the lowest requested over HEATUP seconds
-#ifndef BOARD_DGPU_HEATUP
-#define BOARD_DGPU_HEATUP 4
+#ifndef BOARD_FAN2_HEATUP
+#define BOARD_FAN2_HEATUP 4
 #endif
 
-static uint8_t FAN2_HEATUP[BOARD_DGPU_HEATUP] = { 0 };
+static uint8_t FAN2_HEATUP[BOARD_FAN2_HEATUP] = { 0 };
 
 // Fan speed is the highest HEATUP speed over COOLDOWN seconds
-#ifndef BOARD_DGPU_COOLDOWN
-#define BOARD_DGPU_COOLDOWN 10
+#ifndef BOARD_FAN2_COOLDOWN
+#define BOARD_FAN2_COOLDOWN 10
 #endif
 
-static uint8_t FAN2_COOLDOWN[BOARD_DGPU_COOLDOWN] = { 0 };
+static uint8_t FAN2_COOLDOWN[BOARD_FAN2_COOLDOWN] = { 0 };
 
 // Fan curve with temperature in degrees C, duty cycle in percent
 static struct FanPoint __code FAN2_POINTS[] = {
-#ifdef BOARD_DGPU_FAN_POINTS
-    BOARD_DGPU_FAN_POINTS
+#ifdef BOARD_FAN2_POINTS
+    BOARD_FAN2_POINTS
 #else
     FAN_POINT(70, 40),
     FAN_POINT(75, 50),
     FAN_POINT(80, 60),
     FAN_POINT(85, 65),
-    FAN_POINT(90, 65)
+    FAN_POINT(90, 65),
 #endif
 };
 
@@ -209,7 +209,7 @@ static uint8_t fan_cooldown(const struct Fan *const fan, uint8_t duty) __reentra
     return highest;
 }
 
-static uint8_t peci_get_fan_duty(void) {
+static uint8_t get_fan1_duty(void) {
     uint8_t duty;
 
     if (power_state == POWER_STATE_S0) {
@@ -228,7 +228,7 @@ static uint8_t peci_get_fan_duty(void) {
 }
 
 #if CONFIG_HAVE_DGPU
-static uint8_t dgpu_get_fan_duty(void) {
+static uint8_t get_fan2_duty(void) {
     uint8_t duty;
 
     if (power_state == POWER_STATE_S0) {
@@ -246,40 +246,40 @@ static uint8_t dgpu_get_fan_duty(void) {
     return duty;
 }
 #else
-static uint8_t dgpu_get_fan_duty(void) {
+static uint8_t get_fan2_duty(void) {
     return PWM_DUTY(0);
 }
 #endif // CONFIG_HAVE_DGPU
 
-static void fan_duty_set(uint8_t peci_fan_duty, uint8_t dgpu_fan_duty) __reentrant {
+static void fan_duty_set(uint8_t fan1_duty, uint8_t fan2_duty) __reentrant {
 #if SYNC_FANS != 0
-    peci_fan_duty = peci_fan_duty > dgpu_fan_duty ? peci_fan_duty : dgpu_fan_duty;
-    dgpu_fan_duty = peci_fan_duty > dgpu_fan_duty ? peci_fan_duty : dgpu_fan_duty;
+    fan1_duty = fan1_duty > fan2_duty ? fan1_duty : fan2_duty;
+    fan2_duty = fan1_duty > fan2_duty ? fan1_duty : fan2_duty;
 #endif
 
-    // set PECI fan duty
-    if (peci_fan_duty != DCR2) {
-        TRACE("PECI fan_duty_raw=%d\n", peci_fan_duty);
-        last_duty_peci = peci_fan_duty = fan_smooth(last_duty_peci, peci_fan_duty);
-        DCR2 = fan_max ? MAX_FAN_SPEED : peci_fan_duty;
+    // set FAN1 duty
+    if (fan1_duty != DCR2) {
+        TRACE("FAN1 fan_duty_raw=%d\n", fan1_duty);
+        last_fan1_duty = fan1_duty = fan_smooth(last_fan1_duty, fan1_duty);
+        DCR2 = fan_max ? MAX_FAN_SPEED : fan1_duty;
 #if HAVE_CPU_FAN2
         // FIXME: Handle better
-        DCR3 = fan_max ? MAX_FAN_SPEED : peci_fan_duty;
+        DCR3 = fan_max ? MAX_FAN_SPEED : fan1_duty;
 #endif
-        TRACE("PECI fan_duty_smoothed=%d\n", peci_fan_duty);
+        TRACE("FAN1 fan_duty_smoothed=%d\n", fan1_duty);
     }
 
-    // set dGPU fan duty
-    if (dgpu_fan_duty != DCR4) {
-        TRACE("DGPU fan_duty_raw=%d\n", dgpu_fan_duty);
-        last_duty_dgpu = dgpu_fan_duty = fan_smooth(last_duty_dgpu, dgpu_fan_duty);
-        DCR4 = fan_max ? MAX_FAN_SPEED : dgpu_fan_duty;
-        TRACE("DGPU fan_duty_smoothed=%d\n", dgpu_fan_duty);
+    // set FAN2 duty
+    if (fan2_duty != DCR4) {
+        TRACE("FAN2 fan_duty_raw=%d\n", fan2_duty);
+        last_fan2_duty = fan2_duty = fan_smooth(last_fan2_duty, fan2_duty);
+        DCR4 = fan_max ? MAX_FAN_SPEED : fan2_duty;
+        TRACE("FAN2 fan_duty_smoothed=%d\n", fan2_duty);
     }
 }
 
 void fan_update_duty(void) {
-    uint8_t fan1_duty = peci_get_fan_duty();
-    uint8_t fan2_duty = dgpu_get_fan_duty();
+    uint8_t fan1_duty = get_fan1_duty();
+    uint8_t fan2_duty = get_fan2_duty();
     fan_duty_set(fan1_duty, fan2_duty);
 }
diff --git a/src/board/system76/galp5/board.mk b/src/board/system76/galp5/board.mk
index 73df828..439d1ee 100644
--- a/src/board/system76/galp5/board.mk
+++ b/src/board/system76/galp5/board.mk
@@ -40,23 +40,24 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(70, 25), \
 	FAN_POINT(80, 25), \
 	FAN_POINT(80, 40), \
 	FAN_POINT(88, 40), \
-	FAN_POINT(88, 100) \
+	FAN_POINT(88, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(70, 25), \
 	FAN_POINT(75, 40), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/gaze15/board.mk b/src/board/system76/gaze15/board.mk
index 8a98b7d..a309dd8 100644
--- a/src/board/system76/gaze15/board.mk
+++ b/src/board/system76/gaze15/board.mk
@@ -34,23 +34,24 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/gaze16-3050/board.mk b/src/board/system76/gaze16-3050/board.mk
index d65af7b..d484c80 100644
--- a/src/board/system76/gaze16-3050/board.mk
+++ b/src/board/system76/gaze16-3050/board.mk
@@ -39,27 +39,28 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/gaze16-3060-b/board.mk b/src/board/system76/gaze16-3060-b/board.mk
index 03fe152..52a0812 100644
--- a/src/board/system76/gaze16-3060-b/board.mk
+++ b/src/board/system76/gaze16-3060-b/board.mk
@@ -42,27 +42,28 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS+=-DBOARD_FAN2_HEATUP=5
+CFLAGS+=-DBOARD_FAN2_COOLDOWN=20
+CFLAGS+=-DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/gaze16-3060/board.mk b/src/board/system76/gaze16-3060/board.mk
index 0943323..b08f22a 100644
--- a/src/board/system76/gaze16-3060/board.mk
+++ b/src/board/system76/gaze16-3060/board.mk
@@ -39,27 +39,28 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/gaze17-3050/board.mk b/src/board/system76/gaze17-3050/board.mk
index 0adcd45..97e8330 100644
--- a/src/board/system76/gaze17-3050/board.mk
+++ b/src/board/system76/gaze17-3050/board.mk
@@ -42,31 +42,32 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=20
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(50, 28), \
 	FAN_POINT(58, 28), \
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(50, 28), \
 	FAN_POINT(58, 28), \
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/gaze17-3060-b/board.mk b/src/board/system76/gaze17-3060-b/board.mk
index eda21c3..c453d22 100644
--- a/src/board/system76/gaze17-3060-b/board.mk
+++ b/src/board/system76/gaze17-3060-b/board.mk
@@ -43,27 +43,28 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/gaze17-3060/board.mk b/src/board/system76/gaze17-3060/board.mk
index b1ae519..4638946 100644
--- a/src/board/system76/gaze17-3060/board.mk
+++ b/src/board/system76/gaze17-3060/board.mk
@@ -40,27 +40,28 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/gaze18/board.mk b/src/board/system76/gaze18/board.mk
index d572999..1355eb7 100644
--- a/src/board/system76/gaze18/board.mk
+++ b/src/board/system76/gaze18/board.mk
@@ -42,27 +42,28 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/oryp10/board.mk b/src/board/system76/oryp10/board.mk
index 939b381..bc9baf6 100644
--- a/src/board/system76/oryp10/board.mk
+++ b/src/board/system76/oryp10/board.mk
@@ -44,13 +44,10 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Disable syncing fan speeds
-#CFLAGS+=-DSYNC_FANS=0
-
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(50, 40), \
 	FAN_POINT(55, 40), \
 	FAN_POINT(60, 55), \
@@ -64,9 +61,10 @@ CFLAGS+=-DBOARD_FAN_POINTS="\
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(50, 40), \
 	FAN_POINT(56, 40), \
 	FAN_POINT(72, 100), \
diff --git a/src/board/system76/oryp11/board.mk b/src/board/system76/oryp11/board.mk
index 83af05f..5157aed 100644
--- a/src/board/system76/oryp11/board.mk
+++ b/src/board/system76/oryp11/board.mk
@@ -52,31 +52,32 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=28
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 28), \
 	FAN_POINT(65, 28), \
 	FAN_POINT(70, 40), \
 	FAN_POINT(75, 60), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 28), \
 	FAN_POINT(65, 28), \
 	FAN_POINT(70, 40), \
 	FAN_POINT(75, 60), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/oryp12/board.mk b/src/board/system76/oryp12/board.mk
index 7fb6cac..c34fdba 100644
--- a/src/board/system76/oryp12/board.mk
+++ b/src/board/system76/oryp12/board.mk
@@ -45,9 +45,9 @@ CFLAGS += \
 	-DPOWER_LIMIT_DC=55
 
 # Custom fan curve
-CFLAGS += -DBOARD_HEATUP=5
-CFLAGS += -DBOARD_COOLDOWN=20
-CFLAGS += -DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(50, 30), \
 	FAN_POINT(60, 30), \
 	FAN_POINT(65, 40), \
@@ -60,9 +60,10 @@ CFLAGS += -DBOARD_FAN_POINTS="\
 # Enable DGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS += -DBOARD_DGPU_HEATUP=5
-CFLAGS += -DBOARD_DGPU_COOLDOWN=20
-CFLAGS += -DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(50, 30), \
 	FAN_POINT(60, 30), \
 	FAN_POINT(65, 40), \
diff --git a/src/board/system76/oryp5/board.mk b/src/board/system76/oryp5/board.mk
index 354d044..322c922 100644
--- a/src/board/system76/oryp5/board.mk
+++ b/src/board/system76/oryp5/board.mk
@@ -35,23 +35,24 @@ CFLAGS+=\
 	-DPOWER_LIMIT_DC=45
 
 # Custom fan curve
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(60, 40), \
 	FAN_POINT(65, 60), \
 	FAN_POINT(70, 75), \
 	FAN_POINT(75, 90), \
-	FAN_POINT(80, 100) \
+	FAN_POINT(80, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/oryp6/board.mk b/src/board/system76/oryp6/board.mk
index d4f5e00..9d27a4d 100644
--- a/src/board/system76/oryp6/board.mk
+++ b/src/board/system76/oryp6/board.mk
@@ -37,27 +37,28 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
 # Custom fan curve
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
 	FAN_POINT(70, 40), \
 	FAN_POINT(75, 60), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
 	FAN_POINT(70, 40), \
 	FAN_POINT(75, 60), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/oryp7/board.mk b/src/board/system76/oryp7/board.mk
index d4f5e00..9d27a4d 100644
--- a/src/board/system76/oryp7/board.mk
+++ b/src/board/system76/oryp7/board.mk
@@ -37,27 +37,28 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
 # Custom fan curve
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
 	FAN_POINT(70, 40), \
 	FAN_POINT(75, 60), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
 	FAN_POINT(70, 40), \
 	FAN_POINT(75, 60), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/oryp8/board.mk b/src/board/system76/oryp8/board.mk
index 9fcc034..e3aec2e 100644
--- a/src/board/system76/oryp8/board.mk
+++ b/src/board/system76/oryp8/board.mk
@@ -40,27 +40,28 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=25
 
 # Custom fan curve
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
 	FAN_POINT(70, 40), \
 	FAN_POINT(75, 60), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(55, 25), \
 	FAN_POINT(65, 30), \
 	FAN_POINT(70, 40), \
 	FAN_POINT(75, 60), \
 	FAN_POINT(80, 75), \
 	FAN_POINT(85, 90), \
-	FAN_POINT(90, 100) \
+	FAN_POINT(90, 100), \
 "
 
 # Add system76 common code
diff --git a/src/board/system76/oryp9/board.mk b/src/board/system76/oryp9/board.mk
index 8047330..4397fe8 100644
--- a/src/board/system76/oryp9/board.mk
+++ b/src/board/system76/oryp9/board.mk
@@ -41,13 +41,10 @@ CFLAGS+=\
 	-DPOWER_LIMIT_AC=180 \
 	-DPOWER_LIMIT_DC=45
 
-# Disable syncing fan speeds
-#CFLAGS+=-DSYNC_FANS=0
-
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(50, 40), \
 	FAN_POINT(55, 40), \
 	FAN_POINT(60, 55), \
@@ -61,9 +58,10 @@ CFLAGS+=-DBOARD_FAN_POINTS="\
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(50, 40), \
 	FAN_POINT(56, 40), \
 	FAN_POINT(72, 100), \
diff --git a/src/board/system76/serw13/board.mk b/src/board/system76/serw13/board.mk
index 4aa7d7e..6b363eb 100644
--- a/src/board/system76/serw13/board.mk
+++ b/src/board/system76/serw13/board.mk
@@ -49,9 +49,9 @@ CFLAGS+=\
 CFLAGS+=-DSMOOTH_FANS_MIN=28
 
 # Custom fan curve
-CFLAGS+=-DBOARD_HEATUP=5
-CFLAGS+=-DBOARD_COOLDOWN=20
-CFLAGS+=-DBOARD_FAN_POINTS="\
+CFLAGS += -DBOARD_FAN1_HEATUP=5
+CFLAGS += -DBOARD_FAN1_COOLDOWN=20
+CFLAGS += -DBOARD_FAN1_POINTS="\
 	FAN_POINT(50, 28), \
 	FAN_POINT(55, 28), \
 	FAN_POINT(60, 40), \
@@ -63,9 +63,10 @@ CFLAGS+=-DBOARD_FAN_POINTS="\
 # Enable dGPU support
 CONFIG_HAVE_DGPU = y
 CFLAGS += -DI2C_DGPU=I2C_1
-CFLAGS+=-DBOARD_DGPU_HEATUP=5
-CFLAGS+=-DBOARD_DGPU_COOLDOWN=20
-CFLAGS+=-DBOARD_DGPU_FAN_POINTS="\
+
+CFLAGS += -DBOARD_FAN2_HEATUP=5
+CFLAGS += -DBOARD_FAN2_COOLDOWN=20
+CFLAGS += -DBOARD_FAN2_POINTS="\
 	FAN_POINT(50, 28), \
 	FAN_POINT(55, 28), \
 	FAN_POINT(60, 40), \