diff --git a/data/xap/xap_0.1.0.hjson b/data/xap/xap_0.1.0.hjson
index 682e5325f47..60aac6d6ff4 100755
--- a/data/xap/xap_0.1.0.hjson
+++ b/data/xap/xap_0.1.0.hjson
@@ -178,7 +178,7 @@
                 0x03: {
                     type: command
                     name: Secure Status
-                    define: SECURE_STATUS
+                    define: GET_SECURE_STATUS
                     description:
                         '''
                         Query secure route status
@@ -247,7 +247,7 @@
                 0x02: {
                     type: command
                     name: Board identifiers
-                    define: BOARD_IDENTIFIERS
+                    define: GET_BOARD_IDENTIFIERS
                     description:
                         '''
                         Retrieves the set of identifying information for the board.
@@ -282,7 +282,7 @@
                 0x03: {
                     type: command
                     name: Board Manufacturer
-                    define: BOARD_MANUFACTURER
+                    define: GET_BOARD_MANUFACTURER
                     description: Retrieves the name of the manufacturer
                     return_type: string
                     return_constant: QSTR(MANUFACTURER)
@@ -290,7 +290,7 @@
                 0x04: {
                     type: command
                     name: Product Name
-                    define: PRODUCT_NAME
+                    define: GET_PRODUCT_NAME
                     description: Retrieves the product name
                     return_type: string
                     return_constant: QSTR(PRODUCT)
@@ -298,7 +298,7 @@
                 0x05: {
                     type: command
                     name: Config Blob Length
-                    define: CONFIG_BLOB_LEN
+                    define: GET_CONFIG_BLOB_LENGTH
                     description: Retrieves the length of the configuration data bundled within the firmware
                     return_type: u16
                     return_constant: CONFIG_BLOB_GZ_LEN
@@ -306,7 +306,7 @@
                 0x06: {
                     type: command
                     name: Config Blob Chunk
-                    define: CONFIG_BLOB_CHUNK
+                    define: GET_CONFIG_BLOB_CHUNK
                     description: Retrieves a chunk of the configuration data bundled within the firmware
                     request_type: u16
                     request_purpose: offset
@@ -334,7 +334,7 @@
                 0x08: {
                     type: command
                     name: Hardware Identifier
-                    define: HARDWARE_ID
+                    define: GET_HARDWARE_ID
                     description: Retrieves a unique identifier for the board.
                     return_type: u32[4]
                     return_execute: get_hardware_id
diff --git a/quantum/xap/handlers/core.c b/quantum/xap/handlers/core.c
index 6680e35666f..bd69e5d0b20 100644
--- a/quantum/xap/handlers/core.c
+++ b/quantum/xap/handlers/core.c
@@ -6,7 +6,7 @@
 #include "hardware_id.h"
 
 bool xap_execute_get_config_blob_chunk(xap_token_t token, uint16_t offset) {
-    xap_route_qmk_config_blob_chunk_t ret = {0};
+    xap_route_qmk_get_config_blob_chunk_t ret = {0};
 
     bool get_config_blob_chunk(uint16_t offset, uint8_t *data, uint8_t data_len);
     if (!get_config_blob_chunk(offset, (uint8_t *)&ret, sizeof(ret))) {
@@ -32,7 +32,7 @@ bool xap_execute_secure_lock(xap_token_t token) {
 }
 
 #ifdef BOOTLOADER_JUMP_SUPPORTED
-bool xap_execute_request_bootloader(xap_token_t token) {
+bool xap_execute_request_bootloader_jump(xap_token_t token) {
     uint8_t ret = secure_is_unlocked();
 
     // TODO: post to deferred queue so this request can return?