diff --git a/configurations/minerva_fanboard.json b/configurations/minerva_fanboard.json
index 54ad6da..d047b18 100644
--- a/configurations/minerva_fanboard.json
+++ b/configurations/minerva_fanboard.json
@@ -7,7 +7,7 @@
                 "Connector": {
                     "Name": "FCB_TOP_$bus * -1 + 17 FAN0_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN0_PWM",
+                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
                     "Tachs": [
                         0
                     ]
@@ -37,7 +37,7 @@
                 "Connector": {
                     "Name": "FCB_TOP_$bus * -1 + 17 FAN0_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN0_PWM",
+                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
                     "Tachs": [
                         1
                     ]
@@ -67,7 +67,7 @@
                 "Connector": {
                     "Name": "FCB_TOP_$bus * -1 + 17 FAN1_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN1_PWM",
+                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
                     "Tachs": [
                         2
                     ]
@@ -97,7 +97,7 @@
                 "Connector": {
                     "Name": "FCB_TOP_$bus * -1 + 17 FAN1_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN1_PWM",
+                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
                     "Tachs": [
                         3
                     ]
@@ -127,7 +127,7 @@
                 "Connector": {
                     "Name": "FCB_TOP_$bus * -1 + 17 FAN2_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN2_PWM",
+                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
                     "Tachs": [
                         4
                     ]
@@ -157,7 +157,7 @@
                 "Connector": {
                     "Name": "FCB_TOP_$bus * -1 + 17 FAN2_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN2_PWM",
+                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
                     "Tachs": [
                         5
                     ]
@@ -187,7 +187,7 @@
                 "Connector": {
                     "Name": "FCB_TOP_$bus * -1 + 17 FAN3_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN3_PWM",
+                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
                     "Tachs": [
                         6
                     ]
@@ -217,7 +217,7 @@
                 "Connector": {
                     "Name": "FCB_TOP_$bus * -1 + 17 FAN3_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN3_PWM",
+                    "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
                     "Tachs": [
                         7
                     ]
@@ -264,7 +264,7 @@
                 "Connector": {
                     "Name": "FCB_MID_$bus * -1 + 19 FAN0_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN0_PWM",
+                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
                     "Tachs": [
                         0
                     ]
@@ -294,7 +294,7 @@
                 "Connector": {
                     "Name": "FCB_MID_$bus * -1 + 19 FAN0_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN0_PWM",
+                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
                     "Tachs": [
                         1
                     ]
@@ -324,7 +324,7 @@
                 "Connector": {
                     "Name": "FCB_MID_$bus * -1 + 19 FAN1_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN1_PWM",
+                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
                     "Tachs": [
                         2
                     ]
@@ -354,7 +354,7 @@
                 "Connector": {
                     "Name": "FCB_MID_$bus * -1 + 19 FAN1_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN1_PWM",
+                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
                     "Tachs": [
                         3
                     ]
@@ -384,7 +384,7 @@
                 "Connector": {
                     "Name": "FCB_MID_$bus * -1 + 19 FAN2_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN2_PWM",
+                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
                     "Tachs": [
                         4
                     ]
@@ -414,7 +414,7 @@
                 "Connector": {
                     "Name": "FCB_MID_$bus * -1 + 19 FAN2_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN2_PWM",
+                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
                     "Tachs": [
                         5
                     ]
@@ -444,7 +444,7 @@
                 "Connector": {
                     "Name": "FCB_MID_$bus * -1 + 19 FAN3_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN3_PWM",
+                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
                     "Tachs": [
                         6
                     ]
@@ -474,7 +474,7 @@
                 "Connector": {
                     "Name": "FCB_MID_$bus * -1 + 19 FAN3_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN3_PWM",
+                    "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
                     "Tachs": [
                         7
                     ]
@@ -521,7 +521,7 @@
                 "Connector": {
                     "Name": "FCB_BOT_$bus * -1 + 21 FAN0_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN0_PWM",
+                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
                     "Tachs": [
                         0
                     ]
@@ -551,7 +551,7 @@
                 "Connector": {
                     "Name": "FCB_BOT_$bus * -1 + 21 FAN0_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN0_PWM",
+                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
                     "Tachs": [
                         1
                     ]
@@ -581,7 +581,7 @@
                 "Connector": {
                     "Name": "FCB_BOT_$bus * -1 + 21 FAN1_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN1_PWM",
+                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
                     "Tachs": [
                         2
                     ]
@@ -611,7 +611,7 @@
                 "Connector": {
                     "Name": "FCB_BOT_$bus * -1 + 21 FAN1_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN1_PWM",
+                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
                     "Tachs": [
                         3
                     ]
@@ -641,7 +641,7 @@
                 "Connector": {
                     "Name": "FCB_BOT_$bus * -1 + 21 FAN2_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN2_PWM",
+                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
                     "Tachs": [
                         4
                     ]
@@ -671,7 +671,7 @@
                 "Connector": {
                     "Name": "FCB_BOT_$bus * -1 + 21 FAN2_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN2_PWM",
+                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
                     "Tachs": [
                         5
                     ]
@@ -701,7 +701,7 @@
                 "Connector": {
                     "Name": "FCB_BOT_$bus * -1 + 21 FAN3_TACH_IL",
                     "Pwm": 2,
-                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN3_PWM",
+                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
                     "Tachs": [
                         6
                     ]
@@ -731,7 +731,7 @@
                 "Connector": {
                     "Name": "FCB_BOT_$bus * -1 + 21 FAN3_TACH_OL",
                     "Pwm": 2,
-                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN3_PWM",
+                    "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
                     "Tachs": [
                         7
                     ]