diff --git a/Bootloaders/CDC/BootloaderAPITable.S b/Bootloaders/CDC/BootloaderAPITable.S
index d79b4f4210..0d36b54a2c 100644
--- a/Bootloaders/CDC/BootloaderAPITable.S
+++ b/Bootloaders/CDC/BootloaderAPITable.S
@@ -48,15 +48,15 @@ BootloaderAPI_Trampolines:
 		jmp BootloaderAPI_ReadLock
 	BootloaderAPI_WriteLock_Trampoline:
 		jmp BootloaderAPI_WriteLock
-	BootloaderAPU_UNUSED1:
+	BootloaderAPI_UNUSED1:
 		ret
-	BootloaderAPU_UNUSED2:
+	BootloaderAPI_UNUSED2:
 		ret
-	BootloaderAPU_UNUSED3:
+	BootloaderAPI_UNUSED3:
 		ret
-	BootloaderAPU_UNUSED4:
+	BootloaderAPI_UNUSED4:
 		ret
-	BootloaderAPU_UNUSED5:
+	BootloaderAPI_UNUSED5:
 		ret
 
 
@@ -73,11 +73,11 @@ BootloaderAPI_JumpTable:
 	rjmp BootloaderAPI_ReadFuse_Trampoline
 	rjmp BootloaderAPI_ReadLock_Trampoline
 	rjmp BootloaderAPI_WriteLock_Trampoline
-	rjmp BootloaderAPU_UNUSED1 ; UNUSED ENTRY 1
-	rjmp BootloaderAPU_UNUSED2 ; UNUSED ENTRY 2
-	rjmp BootloaderAPU_UNUSED3 ; UNUSED ENTRY 3
-	rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4
-	rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5
+	rjmp BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1
+	rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2
+	rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3
+	rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4
+	rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5
 
 
 
diff --git a/Bootloaders/DFU/BootloaderAPITable.S b/Bootloaders/DFU/BootloaderAPITable.S
index 6aa412e34e..39668bbbbe 100644
--- a/Bootloaders/DFU/BootloaderAPITable.S
+++ b/Bootloaders/DFU/BootloaderAPITable.S
@@ -48,15 +48,15 @@ BootloaderAPI_Trampolines:
 		jmp BootloaderAPI_ReadLock
 	BootloaderAPI_WriteLock_Trampoline:
 		jmp BootloaderAPI_WriteLock
-	BootloaderAPU_UNUSED1:
+	BootloaderAPI_UNUSED1:
 		ret
-	BootloaderAPU_UNUSED2:
+	BootloaderAPI_UNUSED2:
 		ret
-	BootloaderAPU_UNUSED3:
+	BootloaderAPI_UNUSED3:
 		ret
-	BootloaderAPU_UNUSED4:
+	BootloaderAPI_UNUSED4:
 		ret
-	BootloaderAPU_UNUSED5:
+	BootloaderAPI_UNUSED5:
 		ret
 
 
@@ -73,11 +73,11 @@ BootloaderAPI_JumpTable:
 	rjmp BootloaderAPI_ReadFuse_Trampoline
 	rjmp BootloaderAPI_ReadLock_Trampoline
 	rjmp BootloaderAPI_WriteLock_Trampoline
-	rjmp BootloaderAPU_UNUSED1 ; UNUSED ENTRY 1
-	rjmp BootloaderAPU_UNUSED2 ; UNUSED ENTRY 2
-	rjmp BootloaderAPU_UNUSED3 ; UNUSED ENTRY 3
-	rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4
-	rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5
+	rjmp BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1
+	rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2
+	rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3
+	rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4
+	rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5
 
 
 
diff --git a/Bootloaders/MassStorage/BootloaderAPITable.S b/Bootloaders/MassStorage/BootloaderAPITable.S
index 7efe8b4b12..57fb74f6c5 100644
--- a/Bootloaders/MassStorage/BootloaderAPITable.S
+++ b/Bootloaders/MassStorage/BootloaderAPITable.S
@@ -59,15 +59,15 @@ BootloaderAPI_Trampolines:
 		jmp BootloaderAPI_ReadLock
 	BootloaderAPI_WriteLock_Trampoline:
 		jmp BootloaderAPI_WriteLock
-	BootloaderAPU_UNUSED1:
+	BootloaderAPI_UNUSED1:
 		ret
-	BootloaderAPU_UNUSED2:
+	BootloaderAPI_UNUSED2:
 		ret
-	BootloaderAPU_UNUSED3:
+	BootloaderAPI_UNUSED3:
 		ret
-	BootloaderAPU_UNUSED4:
+	BootloaderAPI_UNUSED4:
 		ret
-	BootloaderAPU_UNUSED5:
+	BootloaderAPI_UNUSED5:
 		ret
 
 
@@ -84,11 +84,11 @@ BootloaderAPI_JumpTable:
 	rjmp BootloaderAPI_ReadFuse_Trampoline
 	rjmp BootloaderAPI_ReadLock_Trampoline
 	rjmp BootloaderAPI_WriteLock_Trampoline
-	rjmp BootloaderAPU_UNUSED1 ; UNUSED ENTRY 1
-	rjmp BootloaderAPU_UNUSED2 ; UNUSED ENTRY 2
-	rjmp BootloaderAPU_UNUSED3 ; UNUSED ENTRY 3
-	rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4
-	rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5
+	rjmp BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1
+	rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2
+	rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3
+	rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4
+	rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5
 
 
 
diff --git a/Bootloaders/Printer/BootloaderAPITable.S b/Bootloaders/Printer/BootloaderAPITable.S
index 14a435b7be..75a28aa298 100644
--- a/Bootloaders/Printer/BootloaderAPITable.S
+++ b/Bootloaders/Printer/BootloaderAPITable.S
@@ -48,15 +48,15 @@ BootloaderAPI_Trampolines:
 		jmp BootloaderAPI_ReadLock
 	BootloaderAPI_WriteLock_Trampoline:
 		jmp BootloaderAPI_WriteLock
-	BootloaderAPU_UNUSED1:
+	BootloaderAPI_UNUSED1:
 		ret
-	BootloaderAPU_UNUSED2:
+	BootloaderAPI_UNUSED2:
 		ret
-	BootloaderAPU_UNUSED3:
+	BootloaderAPI_UNUSED3:
 		ret
-	BootloaderAPU_UNUSED4:
+	BootloaderAPI_UNUSED4:
 		ret
-	BootloaderAPU_UNUSED5:
+	BootloaderAPI_UNUSED5:
 		ret
 
 
@@ -73,11 +73,11 @@ BootloaderAPI_JumpTable:
 	rjmp BootloaderAPI_ReadFuse_Trampoline
 	rjmp BootloaderAPI_ReadLock_Trampoline
 	rjmp BootloaderAPI_WriteLock_Trampoline
-	rjmp BootloaderAPU_UNUSED1 ; UNUSED ENTRY 1
-	rjmp BootloaderAPU_UNUSED2 ; UNUSED ENTRY 2
-	rjmp BootloaderAPU_UNUSED3 ; UNUSED ENTRY 3
-	rjmp BootloaderAPU_UNUSED4 ; UNUSED ENTRY 4
-	rjmp BootloaderAPU_UNUSED5 ; UNUSED ENTRY 5
+	rjmp BootloaderAPI_UNUSED1 ; UNUSED ENTRY 1
+	rjmp BootloaderAPI_UNUSED2 ; UNUSED ENTRY 2
+	rjmp BootloaderAPI_UNUSED3 ; UNUSED ENTRY 3
+	rjmp BootloaderAPI_UNUSED4 ; UNUSED ENTRY 4
+	rjmp BootloaderAPI_UNUSED5 ; UNUSED ENTRY 5