diff --git a/android/hal-av.c b/android/hal-av.c
index dee65b5..9e1b3df 100644
--- a/android/hal-av.c
+++ b/android/hal-av.c
@@ -69,7 +69,7 @@ void bt_notify_av(uint16_t opcode, void *buf, uint16_t len)
 
 static bt_status_t av_connect(bt_bdaddr_t *bd_addr)
 {
-	struct hal_op_av_connect cmd;
+	struct hal_cmd_av_connect cmd;
 
 	DBG("");
 
@@ -84,7 +84,7 @@ static bt_status_t av_connect(bt_bdaddr_t *bd_addr)
 
 static bt_status_t av_disconnect(bt_bdaddr_t *bd_addr)
 {
-	struct hal_op_av_disconnect cmd;
+	struct hal_cmd_av_disconnect cmd;
 
 	DBG("");
 
diff --git a/android/hal-msg.h b/android/hal-msg.h
index 55c560c..a0a8390 100644
--- a/android/hal-msg.h
+++ b/android/hal-msg.h
@@ -281,12 +281,12 @@ struct hal_cmd_hid_send_data {
 } __attribute__((packed));
 
 #define HAL_OP_AV_CONNECT	0x01
-struct hal_op_av_connect {
+struct hal_cmd_av_connect {
 	uint8_t bdaddr[6];
 } __attribute__((packed));
 
 #define HAL_OP_AV_DISCONNECT	0x02
-struct hal_op_av_disconnect {
+struct hal_cmd_av_disconnect {
 	uint8_t bdaddr[6];
 } __attribute__((packed));