diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c
--- a/sys/dev/random/fenestrasX/fx_pool.c
+++ b/sys/dev/random/fenestrasX/fx_pool.c
@@ -167,13 +167,7 @@
 	[RANDOM_RANDOMDEV] = {
 		.entc_cls = &fxrng_lo_push,
 	},
-	[RANDOM_PURE_SAFE] = {
-		.entc_cls = &fxrng_hi_push,
-	},
-	[RANDOM_PURE_GLXSB] = {
-		.entc_cls = &fxrng_hi_push,
-	},
-	[RANDOM_PURE_HIFN] = {
+	[RANDOM_PURE_TPM] = {
 		.entc_cls = &fxrng_hi_push,
 	},
 	[RANDOM_PURE_RDRAND] = {
@@ -200,9 +194,6 @@
 	[RANDOM_PURE_DARN] = {
 		.entc_cls = &fxrng_hi_pull,
 	},
-	[RANDOM_PURE_TPM] = {
-		.entc_cls = &fxrng_hi_push,
-	},
 	[RANDOM_PURE_VMGENID] = {
 		.entc_cls = &fxrng_hi_push,
 	},
@@ -215,6 +206,15 @@
 	[RANDOM_PURE_ARM_TRNG] = {
 		.entc_cls = &fxrng_hi_pull,
 	},
+	[RANDOM_PURE_SAFE] = {
+		.entc_cls = &fxrng_hi_push,
+	},
+	[RANDOM_PURE_GLXSB] = {
+		.entc_cls = &fxrng_hi_push,
+	},
+	[RANDOM_PURE_HIFN] = {
+		.entc_cls = &fxrng_hi_push,
+	},
 };
 
 /* Useful for single-bit-per-source state. */
diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c
--- a/sys/dev/random/random_harvestq.c
+++ b/sys/dev/random/random_harvestq.c
@@ -661,9 +661,7 @@
 	[RANDOM_UMA] = "UMA",
 	[RANDOM_CALLOUT] = "CALLOUT",
 	[RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */
-	[RANDOM_PURE_SAFE] = "PURE_SAFE", /* PURE_START */
-	[RANDOM_PURE_GLXSB] = "PURE_GLXSB",
-	[RANDOM_PURE_HIFN] = "PURE_HIFN",
+	[RANDOM_PURE_TPM] = "PURE_TPM", /* PURE_START */
 	[RANDOM_PURE_RDRAND] = "PURE_RDRAND",
 	[RANDOM_PURE_RDSEED] = "PURE_RDSEED",
 	[RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH",
@@ -672,11 +670,13 @@
 	[RANDOM_PURE_BROADCOM] = "PURE_BROADCOM",
 	[RANDOM_PURE_CCP] = "PURE_CCP",
 	[RANDOM_PURE_DARN] = "PURE_DARN",
-	[RANDOM_PURE_TPM] = "PURE_TPM",
 	[RANDOM_PURE_VMGENID] = "PURE_VMGENID",
 	[RANDOM_PURE_QUALCOMM] = "PURE_QUALCOMM",
 	[RANDOM_PURE_ARMV8] = "PURE_ARMV8",
 	[RANDOM_PURE_ARM_TRNG] = "PURE_ARM_TRNG",
+	[RANDOM_PURE_SAFE] = "PURE_SAFE",
+	[RANDOM_PURE_GLXSB] = "PURE_GLXSB",
+	[RANDOM_PURE_HIFN] = "PURE_HIFN",
 	/* "ENTROPYSOURCE" */
 };
 
diff --git a/sys/sys/random.h b/sys/sys/random.h
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -89,9 +89,7 @@
 	RANDOM_ENVIRONMENTAL_END = RANDOM_RANDOMDEV,
 	/* Fast hardware random-number sources from here on. */
 	RANDOM_PURE_START,
-	RANDOM_PURE_SAFE = RANDOM_PURE_START,
-	RANDOM_PURE_GLXSB,
-	RANDOM_PURE_HIFN,
+	RANDOM_PURE_TPM = RANDOM_PURE_START,
 	RANDOM_PURE_RDRAND,
 	RANDOM_PURE_RDSEED,
 	RANDOM_PURE_NEHEMIAH,
@@ -100,11 +98,13 @@
 	RANDOM_PURE_BROADCOM,
 	RANDOM_PURE_CCP,
 	RANDOM_PURE_DARN,
-	RANDOM_PURE_TPM,
 	RANDOM_PURE_VMGENID,
 	RANDOM_PURE_QUALCOMM,
 	RANDOM_PURE_ARMV8,
 	RANDOM_PURE_ARM_TRNG,
+	RANDOM_PURE_SAFE,
+	RANDOM_PURE_GLXSB,
+	RANDOM_PURE_HIFN,
 	ENTROPYSOURCE
 };
 _Static_assert(ENTROPYSOURCE <= 32,