diff --git a/doc/mgmt-api.txt b/doc/mgmt-api.txt
index e48e741..7f67993 100644
--- a/doc/mgmt-api.txt
+++ b/doc/mgmt-api.txt
@@ -49,10 +49,10 @@ Read Management Supported Commands Command
 	Controller Index:	<non-controller>
 	Command Parameters:
 	Return Parameters:	Num_Of_Commands (2 Octets)
+				Num_Of_Events (2 Octets)
 				Command1 (2 Octets)
 				Command2 (2 Octets)
 				...
-				Num_Of_Events (2 Octets)
 				Event1 (2 Octets)
 				Event2 (2 Octets)
 				...
diff --git a/lib/mgmt.h b/lib/mgmt.h
index 3d40f3b..37e63c8 100644
--- a/lib/mgmt.h
+++ b/lib/mgmt.h
@@ -53,9 +53,8 @@ struct mgmt_rp_read_version {
 #define MGMT_OP_READ_COMMANDS		0x0002
 struct mgmt_rp_read_commands {
 	uint16_t num_commands;
-	uint16_t commands[0];
 	uint16_t num_events;
-	uint16_t events[0];
+	uint16_t opcodes[0];
 } __packed;
 
 #define MGMT_OP_READ_INDEX_LIST		0x0003