diff --git a/apps/bttester/src/btp/btp_gap.h b/apps/bttester/src/btp/btp_gap.h
index 65b56818cf..f49173c6dc 100644
--- a/apps/bttester/src/btp/btp_gap.h
+++ b/apps/bttester/src/btp/btp_gap.h
@@ -135,8 +135,7 @@ struct btp_gap_set_bondable_rp {
 struct btp_gap_start_advertising_cmd {
     uint8_t adv_data_len;
     uint8_t scan_rsp_len;
-    uint8_t adv_data[0];
-    uint8_t scan_rsp[0];
+    uint8_t adv_sr_data[];
 /*
  * This command is very unfortunate because it has two fields after variable
  * data. Those needs to be handled explicitly by handler.
@@ -440,4 +439,4 @@ struct gap_periodic_transfer_recieved_ev {
     uint8_t adv_phy;
     uint16_t per_adv_itvl;
     uint8_t adv_clk_accuracy;
-} __packed;
\ No newline at end of file
+} __packed;
diff --git a/apps/bttester/src/btp_gap.c b/apps/bttester/src/btp_gap.c
index 5d30cbb08d..4af463e1bf 100644
--- a/apps/bttester/src/btp_gap.c
+++ b/apps/bttester/src/btp_gap.c
@@ -462,9 +462,9 @@ start_advertising(const void *cmd, uint16_t cmd_len,
     }
 
     /* currently ignored */
-    duration = get_le32(cp->adv_data + cp->adv_data_len + cp->scan_rsp_len);
+    duration = get_le32(cp->adv_sr_data + cp->adv_data_len + cp->scan_rsp_len);
     (void)duration;
-    addr_type = cp->adv_data[cp->adv_data_len +
+    addr_type = cp->adv_sr_data[cp->adv_data_len +
                              cp->scan_rsp_len +
                              sizeof(duration)];
 
@@ -474,9 +474,9 @@ start_advertising(const void *cmd, uint16_t cmd_len,
             return BTP_STATUS_FAILED;
         }
 
-        ad[adv_len].type = cp->scan_rsp[i++];
-        ad[adv_len].data_len = cp->scan_rsp[i++];
-        ad[adv_len].data = &cp->scan_rsp[i];
+        ad[adv_len].type = cp->adv_sr_data[i++];
+        ad[adv_len].data_len = cp->adv_sr_data[i++];
+        ad[adv_len].data = &cp->adv_sr_data[i];
         i += ad[adv_len].data_len;
     }
 
@@ -486,9 +486,9 @@ start_advertising(const void *cmd, uint16_t cmd_len,
             return BTP_STATUS_FAILED;
         }
 
-        sd[sd_len].type = cp->scan_rsp[i++];
-        sd[sd_len].data_len = cp->scan_rsp[i++];
-        sd[sd_len].data = &cp->scan_rsp[i];
+        sd[sd_len].type = cp->adv_sr_data[i++];
+        sd[sd_len].data_len = cp->adv_sr_data[i++];
+        sd[sd_len].data = &cp->adv_sr_data[i];
         i += sd[sd_len].data_len;
     }