diff --git a/board-sensors.h b/board-sensors.h
index a61938c..b890017 100644
--- a/board-sensors.h
+++ b/board-sensors.h
@@ -20,14 +20,14 @@ static struct hwmon_sensor hwmon_sensor_info[] =
 {
 	{"zenpower",	"temp1",	"CPU ",			"CPU",	"°C",	1000.0,	-40.0	},	/* Tdie */
 	{"asusec",		"temp2",	"Motherboard ",	"CPU",	"°C",	1000.0,	-40.0	},	/* CPU */
-	{"zenpower",	"temp3",	"CPU ",			"CCX",	"°C",	1000.0,	-40.0	},	/* Tccd1 */
-	{"zenpower",	"temp4",	"CPU ",			"CCX",	"°C",	1000.0,	-40.0	},	/* Tccd2 */
-	{"zenpower",	"temp5",	"CPU ",			"CCX",	"°C",	1000.0,	-40.0	},	/* Tccd3 */
-	{"zenpower",	"temp6",	"CPU ",			"CCX",	"°C",	1000.0,	-40.0	},	/* Tccd4 */
-	{"zenpower",	"temp7",	"CPU ",			"CCX",	"°C",	1000.0,	-40.0	},	/* Tccd5 */
-	{"zenpower",	"temp8",	"CPU ",			"CCX",	"°C",	1000.0,	-40.0	},	/* Tccd6 */
-	{"zenpower",	"temp9",	"CPU ",			"CCX",	"°C",	1000.0,	-40.0	},	/* Tccd7 */
-	{"zenpower",	"temp10",	"CPU ",			"CCX",	"°C",	1000.0,	-40.0	},	/* Tccd8 */
+	{"zenpower",	"temp3",	"CPU ",			"CCD",	"°C",	1000.0,	-40.0	},	/* Tccd1 */
+	{"zenpower",	"temp4",	"CPU ",			"CCD",	"°C",	1000.0,	-40.0	},	/* Tccd2 */
+	{"zenpower",	"temp5",	"CPU ",			"CCD",	"°C",	1000.0,	-40.0	},	/* Tccd3 */
+	{"zenpower",	"temp6",	"CPU ",			"CCD",	"°C",	1000.0,	-40.0	},	/* Tccd4 */
+	{"zenpower",	"temp7",	"CPU ",			"CCD",	"°C",	1000.0,	-40.0	},	/* Tccd5 */
+	{"zenpower",	"temp8",	"CPU ",			"CCD",	"°C",	1000.0,	-40.0	},	/* Tccd6 */
+	{"zenpower",	"temp9",	"CPU ",			"CCD",	"°C",	1000.0,	-40.0	},	/* Tccd7 */
+	{"zenpower",	"temp10",	"CPU ",			"CCD",	"°C",	1000.0,	-40.0	},	/* Tccd8 */
 	{"zen-rapl",	"",			"CPU ",			"POW",	" W",	0.0,	0.0		},	/* Zen RAPL placeholder */
 	{"asusec",		"temp1",	"Motherboard ",	"CHIP",	"°C",	1000.0,	-40.0	},	/* Chipset */
 	{"asusec",		"temp5",	"Motherboard ",	"VRM",	"°C",	1000.0,	-40.0	},	/* VRM */
@@ -36,12 +36,12 @@ static struct hwmon_sensor hwmon_sensor_info[] =
 	{"asusec",		"temp6",	"Motherboard ",	"H2O",	"°C",	1000.0,	-40.0	},	/* Water_In */
 	{"asusec",		"temp7",	"Motherboard ",	"H2O",	"°C",	1000.0,	-40.0	},	/* Water_Out */
 	{"nvme",		"temp1",	"NVMe ",		"NVME",	"°C",	1000.0,	-40.0	},	/* NVME Composite */
-	{"nct6798",		"fan2",		"CPU fan",		"CPU",	"%",	15.0,	0.0		},	/* cpu_fan */
-	{"asusec",		"fan1",		"",				"CPU",	"%",	15.0,	0.0		},	/* cpu_opt */
-	{"nct6798",		"fan1",		"Chassis 1",	"CHA",	"%",	12.0,	0.0		},	/* cha1? */
-	{"nct6798",		"fan3",		"Chassis 2",	"CHA",	"%",	12.0,	0.0		},	/* cha2? */
-	{"nct6798",		"fan4",		"Chassis 3",	"CHA",	"%",	13.0,	0.0		},	/* cha3 */
-	{"nct6798",		"fan5",		"H amp",		"CHA",	"%",	12.0,	0.0		},	/* h_amp? */
+	{"nct6798",		"fan2",		"CPU fan",		"CPU",	"%",	15.0,	0.0		},	/* cpu_fan, cpu mid */
+	{"asusec",		"fan1",		"",				"CPU",	"%",	15.0,	0.0		},	/* cpu_opt, cpu front */
+	{"nct6798",		"fan5",		"H amp",		"CHA",	"%",	12.0,	0.0		},	/* h_amp, front fan */
+	{"nct6798",		"fan3",		"Chassis 2",	"CHA",	"%",	12.0,	0.0		},	/* cha2, top front */
+	{"nct6798",		"fan1",		"Chassis 1",	"CHA",	"%",	12.0,	0.0		},	/* cha1, top rear */
+	{"nct6798",		"fan4",		"Chassis 3",	"CHA",	"%",	13.0,	0.0		},	/* cha3, rear */
 	{"nct6798",		"fan6",		"AIO pump",		"CHA",	"%",	12.0,	0.0		},	/* aio_pump? */
 	{"nct6798",		"fan7",		"W pump",		"CHA",	"%",	12.0,	0.0		},	/* w_pump+? */
 	{"asusec",		"fan2",		"",				"CHIP",	"%",	35.0,	0.0		},	/* chipset */