diff --git a/tools/parser/att.c b/tools/parser/att.c
index 5d9bea4..82766c7 100644
--- a/tools/parser/att.c
+++ b/tools/parser/att.c
@@ -256,9 +256,9 @@ static const char *uuid2str(uint16_t uuid)
 
 static void att_error_dump(int level, struct frame *frm)
 {
-	uint8_t op = get_u8(frm);
-	uint16_t handle = btohs(htons(get_u16(frm)));
-	uint8_t err = get_u8(frm);
+	uint8_t op = p_get_u8(frm);
+	uint16_t handle = btohs(htons(p_get_u16(frm)));
+	uint8_t err = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("Error: %s (%d)\n", atterror2str(err), err);
@@ -269,7 +269,7 @@ static void att_error_dump(int level, struct frame *frm)
 
 static void att_mtu_req_dump(int level, struct frame *frm)
 {
-	uint16_t client_rx_mtu = btohs(htons(get_u16(frm)));
+	uint16_t client_rx_mtu = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("client rx mtu %d\n", client_rx_mtu);
@@ -277,7 +277,7 @@ static void att_mtu_req_dump(int level, struct frame *frm)
 
 static void att_mtu_resp_dump(int level, struct frame *frm)
 {
-	uint16_t server_rx_mtu = btohs(htons(get_u16(frm)));
+	uint16_t server_rx_mtu = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("server rx mtu %d\n", server_rx_mtu);
@@ -285,8 +285,8 @@ static void att_mtu_resp_dump(int level, struct frame *frm)
 
 static void att_find_info_req_dump(int level, struct frame *frm)
 {
-	uint16_t start = btohs(htons(get_u16(frm)));
-	uint16_t end = btohs(htons(get_u16(frm)));
+	uint16_t start = btohs(htons(p_get_u16(frm)));
+	uint16_t end = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("start 0x%4.4x, end 0x%4.4x\n", start, end);
@@ -298,7 +298,7 @@ static void print_uuid128(struct frame *frm)
 	int i;
 
 	for (i = 0; i < 16; i++)
-		uuid[15 - i] = get_u8(frm);
+		uuid[15 - i] = p_get_u8(frm);
 
 	for (i = 0; i < 16; i++) {
 		printf("%02x", uuid[i]);
@@ -309,7 +309,7 @@ static void print_uuid128(struct frame *frm)
 
 static void att_find_info_resp_dump(int level, struct frame *frm)
 {
-	uint8_t fmt = get_u8(frm);
+	uint8_t fmt = p_get_u8(frm);
 
 	p_indent(level, frm);
 
@@ -317,8 +317,8 @@ static void att_find_info_resp_dump(int level, struct frame *frm)
 		printf("format: uuid-16\n");
 
 		while (frm->len > 0) {
-			uint16_t handle = btohs(htons(get_u16(frm)));
-			uint16_t uuid = btohs(htons(get_u16(frm)));
+			uint16_t handle = btohs(htons(p_get_u16(frm)));
+			uint16_t uuid = btohs(htons(p_get_u16(frm)));
 			p_indent(level + 1, frm);
 			printf("handle 0x%4.4x, uuid 0x%4.4x (%s)\n", handle, uuid,
 					uuid2str(uuid));
@@ -327,7 +327,7 @@ static void att_find_info_resp_dump(int level, struct frame *frm)
 		printf("format: uuid-128\n");
 
 		while (frm->len > 0) {
-			uint16_t handle = btohs(htons(get_u16(frm)));
+			uint16_t handle = btohs(htons(p_get_u16(frm)));
 
 			p_indent(level + 1, frm);
 			printf("handle 0x%4.4x, uuid ", handle);
@@ -339,9 +339,9 @@ static void att_find_info_resp_dump(int level, struct frame *frm)
 
 static void att_find_by_type_req_dump(int level, struct frame *frm)
 {
-	uint16_t start = btohs(htons(get_u16(frm)));
-	uint16_t end = btohs(htons(get_u16(frm)));
-	uint16_t uuid = btohs(htons(get_u16(frm)));
+	uint16_t start = btohs(htons(p_get_u16(frm)));
+	uint16_t end = btohs(htons(p_get_u16(frm)));
+	uint16_t uuid = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("start 0x%4.4x, end 0x%4.4x, uuid 0x%4.4x\n", start, end, uuid);
@@ -349,15 +349,15 @@ static void att_find_by_type_req_dump(int level, struct frame *frm)
 	p_indent(level, frm);
 	printf("value");
 	while (frm->len > 0)
-		printf(" 0x%2.2x", get_u8(frm));
+		printf(" 0x%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
 static void att_find_by_type_resp_dump(int level, struct frame *frm)
 {
 	while (frm->len > 0) {
-		uint16_t uuid = btohs(htons(get_u16(frm)));
-		uint16_t end = btohs(htons(get_u16(frm)));
+		uint16_t uuid = btohs(htons(p_get_u16(frm)));
+		uint16_t end = btohs(htons(p_get_u16(frm)));
 
 		p_indent(level, frm);
 		printf("Found attr 0x%4.4x, group end handle 0x%4.4x\n",
@@ -367,15 +367,15 @@ static void att_find_by_type_resp_dump(int level, struct frame *frm)
 
 static void att_read_by_type_req_dump(int level, struct frame *frm)
 {
-	uint16_t start = btohs(htons(get_u16(frm)));
-	uint16_t end = btohs(htons(get_u16(frm)));
+	uint16_t start = btohs(htons(p_get_u16(frm)));
+	uint16_t end = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("start 0x%4.4x, end 0x%4.4x\n", start, end);
 
 	p_indent(level, frm);
 	if (frm->len == 2) {
-		printf("type-uuid 0x%4.4x\n", btohs(htons(get_u16(frm))));
+		printf("type-uuid 0x%4.4x\n", btohs(htons(p_get_u16(frm))));
 	} else if (frm->len == 16) {
 		printf("type-uuid ");
 		print_uuid128(frm);
@@ -389,20 +389,20 @@ static void att_read_by_type_req_dump(int level, struct frame *frm)
 
 static void att_read_by_type_resp_dump(int level, struct frame *frm)
 {
-	uint8_t length = get_u8(frm);
+	uint8_t length = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("length: %d\n", length);
 
 	while (frm->len > 0) {
-		uint16_t handle = btohs(htons(get_u16(frm)));
+		uint16_t handle = btohs(htons(p_get_u16(frm)));
 		int val_len = length - 2;
 		int i;
 
 		p_indent(level + 1, frm);
 		printf("handle 0x%4.4x, value ", handle);
 		for (i = 0; i < val_len; i++) {
-			printf("0x%.2x ", get_u8(frm));
+			printf("0x%.2x ", p_get_u8(frm));
 		}
 		printf("\n");
 	}
@@ -410,7 +410,7 @@ static void att_read_by_type_resp_dump(int level, struct frame *frm)
 
 static void att_read_req_dump(int level, struct frame *frm)
 {
-	uint16_t handle = btohs(htons(get_u16(frm)));
+	uint16_t handle = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("handle 0x%4.4x\n", handle);
@@ -418,8 +418,8 @@ static void att_read_req_dump(int level, struct frame *frm)
 
 static void att_read_blob_req_dump(int level, struct frame *frm)
 {
-	uint16_t handle = btohs(htons(get_u16(frm)));
-	uint16_t offset = btohs(htons(get_u16(frm)));
+	uint16_t handle = btohs(htons(p_get_u16(frm)));
+	uint16_t offset = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("handle 0x%4.4x offset 0x%4.4x\n", handle, offset);
@@ -431,7 +431,7 @@ static void att_read_blob_resp_dump(int level, struct frame *frm)
 	printf("value");
 
 	while (frm->len > 0)
-		printf(" 0x%2.2x", get_u8(frm));
+		printf(" 0x%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
@@ -442,7 +442,7 @@ static void att_read_multi_req_dump(int level, struct frame *frm)
 
 	while (frm->len > 0) {
 		p_indent(level, frm);
-		printf("handle 0x%4.4x\n", btohs(htons(get_u16(frm))));
+		printf("handle 0x%4.4x\n", btohs(htons(p_get_u16(frm))));
 	}
 }
 
@@ -452,17 +452,17 @@ static void att_read_multi_resp_dump(int level, struct frame *frm)
 	printf("values");
 
 	while (frm->len > 0)
-		printf(" 0x%2.2x", get_u8(frm));
+		printf(" 0x%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
 static void att_read_by_group_resp_dump(int level, struct frame *frm)
 {
-	uint8_t length = get_u8(frm);
+	uint8_t length = p_get_u8(frm);
 
 	while (frm->len > 0) {
-		uint16_t attr_handle = btohs(htons(get_u16(frm)));
-		uint16_t end_grp_handle = btohs(htons(get_u16(frm)));
+		uint16_t attr_handle = btohs(htons(p_get_u16(frm)));
+		uint16_t end_grp_handle = btohs(htons(p_get_u16(frm)));
 		uint8_t remaining = length - 4;
 
 		p_indent(level, frm);
@@ -472,7 +472,7 @@ static void att_read_by_group_resp_dump(int level, struct frame *frm)
 		p_indent(level, frm);
 		printf("value");
 		while (remaining > 0) {
-			printf(" 0x%2.2x", get_u8(frm));
+			printf(" 0x%2.2x", p_get_u8(frm));
 			remaining--;
 		}
 		printf("\n");
@@ -481,39 +481,39 @@ static void att_read_by_group_resp_dump(int level, struct frame *frm)
 
 static void att_write_req_dump(int level, struct frame *frm)
 {
-	uint16_t handle = btohs(htons(get_u16(frm)));
+	uint16_t handle = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("handle 0x%4.4x value ", handle);
 
 	while (frm->len > 0)
-		printf(" 0x%2.2x", get_u8(frm));
+		printf(" 0x%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
 static void att_signed_write_dump(int level, struct frame *frm)
 {
-	uint16_t handle = btohs(htons(get_u16(frm)));
+	uint16_t handle = btohs(htons(p_get_u16(frm)));
 	int value_len = frm->len - 12; /* handle:2 already accounted, sig: 12 */
 
 	p_indent(level, frm);
 	printf("handle 0x%4.4x value ", handle);
 
 	while (value_len--)
-		printf(" 0x%2.2x", get_u8(frm));
+		printf(" 0x%2.2x", p_get_u8(frm));
 	printf("\n");
 
 	p_indent(level, frm);
 	printf("auth signature ");
 	while (frm->len > 0)
-		printf(" 0x%2.2x", get_u8(frm));
+		printf(" 0x%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
 static void att_prep_write_dump(int level, struct frame *frm)
 {
-	uint16_t handle = btohs(htons(get_u16(frm)));
-	uint16_t val_offset = btohs(htons(get_u16(frm)));
+	uint16_t handle = btohs(htons(p_get_u16(frm)));
+	uint16_t val_offset = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("attr handle 0x%4.4x, value offset 0x%4.4x\n", handle,
@@ -522,13 +522,13 @@ static void att_prep_write_dump(int level, struct frame *frm)
 	p_indent(level, frm);
 	printf("part attr value ");
 	while (frm->len > 0)
-		printf(" 0x%2.2x", get_u8(frm));
+		printf(" 0x%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
 static void att_exec_write_req_dump(int level, struct frame *frm)
 {
-	uint8_t flags = get_u8(frm);
+	uint8_t flags = p_get_u8(frm);
 
 	p_indent(level, frm);
 	if (flags == 0x00)
@@ -541,7 +541,7 @@ static void att_exec_write_req_dump(int level, struct frame *frm)
 
 static void att_handle_notify_dump(int level, struct frame *frm)
 {
-	uint16_t handle = btohs(htons(get_u16(frm)));
+	uint16_t handle = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("handle 0x%4.4x\n", handle);
@@ -549,7 +549,7 @@ static void att_handle_notify_dump(int level, struct frame *frm)
 	p_indent(level, frm);
 	printf("value ");
 	while (frm->len > 0)
-		printf("0x%.2x ", get_u8(frm));
+		printf("0x%.2x ", p_get_u8(frm));
 	printf("\n");
 }
 
@@ -557,7 +557,7 @@ void att_dump(int level, struct frame *frm)
 {
 	uint8_t op;
 
-	op = get_u8(frm);
+	op = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("ATT: %s (0x%.2x)\n", attop2str(op), op);
diff --git a/tools/parser/avctp.c b/tools/parser/avctp.c
index 58b181d..70c5f66 100644
--- a/tools/parser/avctp.c
+++ b/tools/parser/avctp.c
@@ -57,8 +57,8 @@ void avctp_dump(int level, struct frame *frm, uint16_t psm)
 
 	p_indent(level, frm);
 
-	hdr = get_u8(frm);
-	pid = get_u16(frm);
+	hdr = p_get_u8(frm);
+	pid = p_get_u16(frm);
 
 	printf("AVCTP %s: %s %s: pt 0x%02x transaction %d pid 0x%04x\n",
 				psm == 23 ? "Control" : "Browsing",
diff --git a/tools/parser/avdtp.c b/tools/parser/avdtp.c
index 5969067..f05f329 100644
--- a/tools/parser/avdtp.c
+++ b/tools/parser/avdtp.c
@@ -186,7 +186,7 @@ static void errorcode(int level, struct frame *frm)
 	uint8_t code;
 
 	p_indent(level, frm);
-	code = get_u8(frm);
+	code = p_get_u8(frm);
 	printf("Error code %d\n", code);
 }
 
@@ -195,7 +195,7 @@ static void acp_seid(int level, struct frame *frm)
 	uint8_t seid;
 
 	p_indent(level, frm);
-	seid = get_u8(frm);
+	seid = p_get_u8(frm);
 	printf("ACP SEID %d\n", seid >> 2);
 }
 
@@ -204,8 +204,8 @@ static void acp_int_seid(int level, struct frame *frm)
 	uint8_t acp_seid, int_seid;
 
 	p_indent(level, frm);
-	acp_seid = get_u8(frm);
-	int_seid = get_u8(frm);
+	acp_seid = p_get_u8(frm);
+	int_seid = p_get_u8(frm);
 	printf("ACP SEID %d - INT SEID %d\n", acp_seid >> 2, int_seid >> 2);
 }
 
@@ -215,8 +215,8 @@ static void capabilities(int level, struct frame *frm)
 
 	while (frm->len > 1) {
 		p_indent(level, frm);
-		cat = get_u8(frm);
-		len = get_u8(frm);
+		cat = p_get_u8(frm);
+		len = p_get_u8(frm);
 
 		if (cat == 7) {
 			uint8_t type, codec;
@@ -224,12 +224,12 @@ static void capabilities(int level, struct frame *frm)
 			uint32_t bitrate, vendor = 0;
 			int i;
 
-			type  = get_u8(frm);
-			codec = get_u8(frm);
+			type  = p_get_u8(frm);
+			codec = p_get_u8(frm);
 
 			if (codec == 255) {
-				vendor = btohl(htonl(get_u32(frm)));
-				vndcodec = btohs(htons(get_u16(frm)));
+				vendor = btohl(htonl(p_get_u32(frm)));
+				vndcodec = btohs(htons(p_get_u16(frm)));
 
 				printf("%s - %s (%s)\n", cat2str(cat),
 						codec2str(type, codec),
@@ -241,7 +241,7 @@ static void capabilities(int level, struct frame *frm)
 
 			switch (codec) {
 			case 0:
-				tmp = get_u8(frm);
+				tmp = p_get_u8(frm);
 				p_indent(level + 1, frm);
 				if (tmp & 0x80)
 					printf("16kHz ");
@@ -262,7 +262,7 @@ static void capabilities(int level, struct frame *frm)
 				if (tmp & 0x01)
 					printf("JointStereo ");
 				printf("\n");
-				tmp = get_u8(frm);
+				tmp = p_get_u8(frm);
 				p_indent(level + 1, frm);
 				if (tmp & 0x80)
 					printf("4 ");
@@ -285,12 +285,12 @@ static void capabilities(int level, struct frame *frm)
 				if (tmp & 0x01)
 					printf("Loudness ");
 				printf("\n");
-				tmp = get_u8(frm);
+				tmp = p_get_u8(frm);
 				p_indent(level + 1, frm);
-				printf("Bitpool Range %d-%d\n", tmp, get_u8(frm));
+				printf("Bitpool Range %d-%d\n", tmp, p_get_u8(frm));
 				break;
 			case 1:
-				tmp = get_u8(frm);
+				tmp = p_get_u8(frm);
 				p_indent(level + 1, frm);
 				printf("Layers: ");
 				if (tmp & 0x80)
@@ -313,7 +313,7 @@ static void capabilities(int level, struct frame *frm)
 				if (tmp & 0x01)
 					printf("JointStereo ");
 				printf("\n");
-				tmp = get_u8(frm);
+				tmp = p_get_u8(frm);
 				p_indent(level + 1, frm);
 				printf("Media Payload Format: RFC-2250 %s\n",
 						tmp & 0x40 ? "RFC-3119" : "");
@@ -331,7 +331,7 @@ static void capabilities(int level, struct frame *frm)
 				if (tmp & 0x01)
 					printf("48kHz ");
 				printf("\n");
-				tmp = get_u16(frm);
+				tmp = p_get_u16(frm);
 				p_indent(level + 1, frm);
 				printf("VBR: %s\n",
 						tmp & 0x8000 ? "Yes" : "No");
@@ -347,7 +347,7 @@ static void capabilities(int level, struct frame *frm)
 				printf("\n");
 				break;
 			case 2:
-				tmp = get_u8(frm);
+				tmp = p_get_u8(frm);
 				p_indent(level + 1, frm);
 				if (tmp & 0x80)
 					printf("MPEG-2 AAC LC ");
@@ -358,7 +358,7 @@ static void capabilities(int level, struct frame *frm)
 				if (tmp & 0x10)
 					printf("MPEG-4 AAC scalable ");
 				printf("\n");
-				tmp = get_u16(frm);
+				tmp = p_get_u16(frm);
 				freq = tmp >> 4;
 				p_indent(level + 1, frm);
 				if (freq & 0x0800)
@@ -393,8 +393,8 @@ static void capabilities(int level, struct frame *frm)
 				if (tmp & 0x01)
 					printf("2 ");
 				printf("Channels\n");
-				tmp = get_u8(frm);
-				bitrate = ((tmp & 0x7f) << 16) | get_u16(frm);
+				tmp = p_get_u8(frm);
+				bitrate = ((tmp & 0x7f) << 16) | p_get_u16(frm);
 				p_indent(level + 1, frm);
 				printf("%ubps ", bitrate);
 				printf("%s\n", tmp & 0x80 ? "VBR" : "");
@@ -402,7 +402,7 @@ static void capabilities(int level, struct frame *frm)
 			case 255:
 				if (vendor == 0x0000004f &&
 							vndcodec == 0x0001) {
-					tmp = get_u8(frm);
+					tmp = p_get_u8(frm);
 					p_indent(level + 1, frm);
 					if (tmp & 0x80)
 						printf("16kHz ");
@@ -450,8 +450,8 @@ static inline void discover(int level, uint8_t hdr, struct frame *frm)
 	case 0x02:
 		while (frm->len > 1) {
 			p_indent(level, frm);
-			seid = get_u8(frm);
-			type = get_u8(frm);
+			seid = p_get_u8(frm);
+			type = p_get_u8(frm);
 			printf("ACP SEID %d - %s %s%s\n",
 				seid >> 2, media2str(type >> 4),
 				type & 0x08 ? "Sink" : "Source",
@@ -490,7 +490,7 @@ static inline void set_configuration(int level, uint8_t hdr, struct frame *frm)
 		break;
 	case 0x03:
 		p_indent(level, frm);
-		cat = get_u8(frm);
+		cat = p_get_u8(frm);
 		printf("%s\n", cat2str(cat));
 		errorcode(level, frm);
 		break;
@@ -522,7 +522,7 @@ static inline void reconfigure(int level, uint8_t hdr, struct frame *frm)
 		break;
 	case 0x03:
 		p_indent(level, frm);
-		cat = get_u8(frm);
+		cat = p_get_u8(frm);
 		printf("%s\n", cat2str(cat));
 		errorcode(level, frm);
 		break;
@@ -588,8 +588,8 @@ static inline void delay_report(int level, uint8_t hdr, struct frame *frm)
 	switch (hdr & 0x03) {
 	case 0x00:
 		p_indent(level, frm);
-		seid = get_u8(frm);
-		delay = get_u16(frm);
+		seid = p_get_u8(frm);
+		delay = p_get_u16(frm);
 		printf("ACP SEID %d delay %u.%ums\n", seid >> 2,
 						delay / 10, delay % 10);
 		break;
@@ -608,10 +608,10 @@ void avdtp_dump(int level, struct frame *frm)
 	switch (frm->num) {
 	case 1:
 		p_indent(level, frm);
-		hdr = get_u8(frm);
+		hdr = p_get_u8(frm);
 
-		nsp = (hdr & 0x0c) == 0x04 ? get_u8(frm) : 0;
-		sid = hdr & 0x08 ? 0x00 : get_u8(frm);
+		nsp = (hdr & 0x0c) == 0x04 ? p_get_u8(frm) : 0;
+		sid = hdr & 0x08 ? 0x00 : p_get_u8(frm);
 
 		printf("AVDTP(s): %s %s: transaction %d nsp 0x%02x\n",
 			hdr & 0x08 ? pt2str(hdr) : si2str(sid),
@@ -661,11 +661,11 @@ void avdtp_dump(int level, struct frame *frm)
 
 	case 2:
 		p_indent(level, frm);
-		hdr  = get_u8(frm);
-		type = get_u8(frm);
-		seqn = get_u16(frm);
-		time = get_u32(frm);
-		ssrc = get_u32(frm);
+		hdr  = p_get_u8(frm);
+		type = p_get_u8(frm);
+		seqn = p_get_u16(frm);
+		time = p_get_u32(frm);
+		ssrc = p_get_u32(frm);
 
 		printf("AVDTP(m): ver %d %s%scc %d %spt %d seqn %d time %d ssrc %d\n",
 			hdr >> 6, hdr & 0x20 ? "pad " : "", hdr & 0x10 ? "ext " : "",
diff --git a/tools/parser/avrcp.c b/tools/parser/avrcp.c
index 7c320ea..5f29272 100644
--- a/tools/parser/avrcp.c
+++ b/tools/parser/avrcp.c
@@ -422,7 +422,7 @@ static void avrcp_rejected_dump(int level, struct frame *frm, uint16_t len)
 		return;
 	}
 
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("Error: 0x%02x (%s)\n", status, error2str(status));
 }
 
@@ -439,7 +439,7 @@ static void avrcp_get_capabilities_dump(int level, struct frame *frm, uint16_t l
 		return;
 	}
 
-	cap = get_u8(frm);
+	cap = p_get_u8(frm);
 	printf("CapabilityID: 0x%02x (%s)\n", cap, cap2str(cap));
 
 	if (len == 1)
@@ -447,7 +447,7 @@ static void avrcp_get_capabilities_dump(int level, struct frame *frm, uint16_t l
 
 	p_indent(level, frm);
 
-	count = get_u8(frm);
+	count = p_get_u8(frm);
 	printf("CapabilityCount: 0x%02x\n", count);
 
 	switch (cap) {
@@ -459,7 +459,7 @@ static void avrcp_get_capabilities_dump(int level, struct frame *frm, uint16_t l
 
 			printf("%s: 0x", cap2str(cap));
 			for (i = 0; i < 3; i++)
-				printf("%02x", get_u8(frm));
+				printf("%02x", p_get_u8(frm));
 			printf("\n");
 		}
 		break;
@@ -469,7 +469,7 @@ static void avrcp_get_capabilities_dump(int level, struct frame *frm, uint16_t l
 
 			p_indent(level, frm);
 
-			event = get_u8(frm);
+			event = p_get_u8(frm);
 			printf("%s: 0x%02x (%s)\n", cap2str(cap), event,
 							event2str(event));
 		}
@@ -507,7 +507,7 @@ static void avrcp_list_player_attributes_dump(int level, struct frame *frm,
 
 	p_indent(level, frm);
 
-	num = get_u8(frm);
+	num = p_get_u8(frm);
 	printf("AttributeCount: 0x%02x\n", num);
 
 	for (; num > 0; num--) {
@@ -515,7 +515,7 @@ static void avrcp_list_player_attributes_dump(int level, struct frame *frm,
 
 		p_indent(level, frm);
 
-		attr = get_u8(frm);
+		attr = p_get_u8(frm);
 		printf("AttributeID: 0x%02x (%s)\n", attr, attr2str(attr));
 	}
 }
@@ -591,13 +591,13 @@ static void avrcp_list_player_values_dump(int level, struct frame *frm,
 	if (ctype > AVC_CTYPE_GENERAL_INQUIRY)
 		goto response;
 
-	attr = get_u8(frm);
+	attr = p_get_u8(frm);
 	printf("AttributeID: 0x%02x (%s)\n", attr, attr2str(attr));
 
 	return;
 
 response:
-	num = get_u8(frm);
+	num = p_get_u8(frm);
 	printf("ValueCount: 0x%02x\n", num);
 
 	for (; num > 0; num--) {
@@ -605,7 +605,7 @@ response:
 
 		p_indent(level, frm);
 
-		value = get_u8(frm);
+		value = p_get_u8(frm);
 		printf("ValueID: 0x%02x (%s)\n", value,
 						value2str(attr, value));
 	}
@@ -627,7 +627,7 @@ static void avrcp_get_current_player_value_dump(int level, struct frame *frm,
 	if (ctype > AVC_CTYPE_GENERAL_INQUIRY)
 		goto response;
 
-	num = get_u8(frm);
+	num = p_get_u8(frm);
 	printf("AttributeCount: 0x%02x\n", num);
 
 	for (; num > 0; num--) {
@@ -635,14 +635,14 @@ static void avrcp_get_current_player_value_dump(int level, struct frame *frm,
 
 		p_indent(level, frm);
 
-		attr = get_u8(frm);
+		attr = p_get_u8(frm);
 		printf("AttributeID: 0x%02x (%s)\n", attr, attr2str(attr));
 	}
 
 	return;
 
 response:
-	num = get_u8(frm);
+	num = p_get_u8(frm);
 	printf("ValueCount: 0x%02x\n", num);
 
 	for (; num > 0; num--) {
@@ -650,12 +650,12 @@ response:
 
 		p_indent(level, frm);
 
-		attr = get_u8(frm);
+		attr = p_get_u8(frm);
 		printf("AttributeID: 0x%02x (%s)\n", attr, attr2str(attr));
 
 		p_indent(level, frm);
 
-		value = get_u8(frm);
+		value = p_get_u8(frm);
 		printf("ValueID: 0x%02x (%s)\n", value,
 						value2str(attr, value));
 	}
@@ -677,7 +677,7 @@ static void avrcp_set_player_value_dump(int level, struct frame *frm,
 		return;
 	}
 
-	num = get_u8(frm);
+	num = p_get_u8(frm);
 	printf("AttributeCount: 0x%02x\n", num);
 
 	for (; num > 0; num--) {
@@ -685,12 +685,12 @@ static void avrcp_set_player_value_dump(int level, struct frame *frm,
 
 		p_indent(level, frm);
 
-		attr = get_u8(frm);
+		attr = p_get_u8(frm);
 		printf("AttributeID: 0x%02x (%s)\n", attr, attr2str(attr));
 
 		p_indent(level, frm);
 
-		value = get_u8(frm);
+		value = p_get_u8(frm);
 		printf("ValueID: 0x%02x (%s)\n", value,
 						value2str(attr, value));
 	}
@@ -742,7 +742,7 @@ static void avrcp_get_player_attribute_text_dump(int level, struct frame *frm,
 		return;
 	}
 
-	num = get_u8(frm);
+	num = p_get_u8(frm);
 	printf("AttributeCount: 0x%02x\n", num);
 
 	if (ctype > AVC_CTYPE_GENERAL_INQUIRY)
@@ -753,7 +753,7 @@ static void avrcp_get_player_attribute_text_dump(int level, struct frame *frm,
 
 		p_indent(level, frm);
 
-		attr = get_u8(frm);
+		attr = p_get_u8(frm);
 		printf("AttributeID: 0x%02x (%s)\n", attr, attr2str(attr));
 	}
 
@@ -766,25 +766,25 @@ response:
 
 		p_indent(level, frm);
 
-		attr = get_u8(frm);
+		attr = p_get_u8(frm);
 		printf("AttributeID: 0x%02x (%s)\n", attr, attr2str(attr));
 
 		p_indent(level, frm);
 
-		charset = get_u16(frm);
+		charset = p_get_u16(frm);
 		printf("CharsetID: 0x%04x (%s)\n", charset,
 							charset2str(charset));
 
 		p_indent(level, frm);
 
-		len = get_u8(frm);
+		len = p_get_u8(frm);
 		printf("StringLength: 0x%02x\n", len);
 
 		p_indent(level, frm);
 
 		printf("String: ");
 		for (; len > 0; len--) {
-			uint8_t c = get_u8(frm);
+			uint8_t c = p_get_u8(frm);
 			printf("%1c", isprint(c) ? c : '.');
 		}
 		printf("\n");
@@ -808,12 +808,12 @@ static void avrcp_get_player_value_text_dump(int level, struct frame *frm,
 	if (ctype > AVC_CTYPE_GENERAL_INQUIRY)
 		goto response;
 
-	attr = get_u8(frm);
+	attr = p_get_u8(frm);
 	printf("AttributeID: 0x%02x (%s)\n", attr, attr2str(attr));
 
 	p_indent(level, frm);
 
-	num = get_u8(frm);
+	num = p_get_u8(frm);
 	printf("ValueCount: 0x%02x\n", num);
 
 	for (; num > 0; num--) {
@@ -821,7 +821,7 @@ static void avrcp_get_player_value_text_dump(int level, struct frame *frm,
 
 		p_indent(level, frm);
 
-		value = get_u8(frm);
+		value = p_get_u8(frm);
 		printf("ValueID: 0x%02x (%s)\n", value,
 						value2str(attr, value));
 	}
@@ -829,7 +829,7 @@ static void avrcp_get_player_value_text_dump(int level, struct frame *frm,
 	return;
 
 response:
-	num = get_u8(frm);
+	num = p_get_u8(frm);
 	printf("ValueCount: 0x%02x\n", num);
 
 	for (; num > 0; num--) {
@@ -838,26 +838,26 @@ response:
 
 		p_indent(level, frm);
 
-		value = get_u8(frm);
+		value = p_get_u8(frm);
 		printf("ValueID: 0x%02x (%s)\n", value,
 						value2str(attr, value));
 
 		p_indent(level, frm);
 
-		charset = get_u16(frm);
+		charset = p_get_u16(frm);
 		printf("CharsetID: 0x%04x (%s)\n", charset,
 							charset2str(charset));
 
 		p_indent(level, frm);
 
-		len = get_u8(frm);
+		len = p_get_u8(frm);
 		printf("StringLength: 0x%02x\n", len);
 
 		p_indent(level, frm);
 
 		printf("String: ");
 		for (; len > 0; len--) {
-			uint8_t c = get_u8(frm);
+			uint8_t c = p_get_u8(frm);
 			printf("%1c", isprint(c) ? c : '.');
 		}
 		printf("\n");
@@ -880,7 +880,7 @@ static void avrcp_displayable_charset(int level, struct frame *frm,
 		return;
 	}
 
-	num = get_u8(frm);
+	num = p_get_u8(frm);
 	printf("CharsetCount: 0x%02x\n", num);
 
 	for (; num > 0; num--) {
@@ -888,7 +888,7 @@ static void avrcp_displayable_charset(int level, struct frame *frm,
 
 		p_indent(level, frm);
 
-		charset = get_u16(frm);
+		charset = p_get_u16(frm);
 		printf("CharsetID: 0x%04x (%s)\n", charset,
 							charset2str(charset));
 	}
@@ -922,7 +922,7 @@ static void avrcp_ct_battery_status_dump(int level, struct frame *frm,
 
 	p_indent(level, frm);
 
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("BatteryStatus: 0x%02x (%s)\n", status, status2str(status));
 }
 
@@ -968,12 +968,12 @@ static void avrcp_get_element_attributes_dump(int level, struct frame *frm,
 		return;
 	}
 
-	id = get_u64(frm);
+	id = p_get_u64(frm);
 	printf("Identifier: 0x%jx (%s)\n", id, id ? "Reserved" : "PLAYING");
 
 	p_indent(level, frm);
 
-	num = get_u8(frm);
+	num = p_get_u8(frm);
 	printf("AttributeCount: 0x%02x\n", num);
 
 	for (; num > 0; num--) {
@@ -981,7 +981,7 @@ static void avrcp_get_element_attributes_dump(int level, struct frame *frm,
 
 		p_indent(level, frm);
 
-		attr = get_u32(frm);
+		attr = p_get_u32(frm);
 		printf("Attribute: 0x%08x (%s)\n", attr, mediattr2str(attr));
 	}
 
@@ -995,7 +995,7 @@ response:
 			return;
 		}
 
-		num = get_u8(frm);
+		num = p_get_u8(frm);
 		avrcp_continuing.num = num;
 		printf("AttributeCount: 0x%02x\n", num);
 		len--;
@@ -1015,7 +1015,7 @@ response:
 
 			printf("ContinuingAttributeValue: ");
 			for (; size > 0; size--) {
-				uint8_t c = get_u8(frm);
+				uint8_t c = p_get_u8(frm);
 				printf("%1c", isprint(c) ? c : '.');
 			}
 			printf("\n");
@@ -1030,17 +1030,17 @@ response:
 
 		p_indent(level, frm);
 
-		attr = get_u32(frm);
+		attr = p_get_u32(frm);
 		printf("Attribute: 0x%08x (%s)\n", attr, mediattr2str(attr));
 
 		p_indent(level, frm);
 
-		charset = get_u16(frm);
+		charset = p_get_u16(frm);
 		printf("CharsetID: 0x%04x (%s)\n", charset,
 							charset2str(charset));
 
 		p_indent(level, frm);
-		attrlen = get_u16(frm);
+		attrlen = p_get_u16(frm);
 		printf("AttributeValueLength: 0x%04x\n", attrlen);
 
 		len -= sizeof(attr) + sizeof(charset) + sizeof(attrlen);
@@ -1050,7 +1050,7 @@ response:
 
 		printf("AttributeValue: ");
 		for (; attrlen > 0 && len > 0; attrlen--, len--) {
-			uint8_t c = get_u8(frm);
+			uint8_t c = p_get_u8(frm);
 			printf("%1c", isprint(c) ? c : '.');
 		}
 		printf("\n");
@@ -1099,17 +1099,17 @@ static void avrcp_get_play_status_dump(int level, struct frame *frm,
 		return;
 	}
 
-	interval = get_u32(frm);
+	interval = p_get_u32(frm);
 	printf("SongLength: 0x%08x (%u miliseconds)\n", interval, interval);
 
 	p_indent(level, frm);
 
-	interval = get_u32(frm);
+	interval = p_get_u32(frm);
 	printf("SongPosition: 0x%08x (%u miliconds)\n", interval, interval);
 
 	p_indent(level, frm);
 
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("PlayStatus: 0x%02x (%s)\n", status, playstatus2str(status));
 }
 
@@ -1132,12 +1132,12 @@ static void avrcp_register_notification_dump(int level, struct frame *frm,
 		return;
 	}
 
-	event = get_u8(frm);
+	event = p_get_u8(frm);
 	printf("EventID: 0x%02x (%s)\n", event, event2str(event));
 
 	p_indent(level, frm);
 
-	interval = get_u32(frm);
+	interval = p_get_u32(frm);
 	printf("Interval: 0x%08x (%u seconds)\n", interval, interval);
 
 	return;
@@ -1149,33 +1149,33 @@ response:
 		return;
 	}
 
-	event = get_u8(frm);
+	event = p_get_u8(frm);
 	printf("EventID: 0x%02x (%s)\n", event, event2str(event));
 
 	p_indent(level, frm);
 
 	switch (event) {
 	case AVRCP_EVENT_PLAYBACK_STATUS_CHANGED:
-		status = get_u8(frm);
+		status = p_get_u8(frm);
 		printf("PlayStatus: 0x%02x (%s)\n", status,
 						playstatus2str(status));
 		break;
 	case AVRCP_EVENT_TRACK_CHANGED:
-		id = get_u64(frm);
+		id = p_get_u64(frm);
 		printf("Identifier: 0x%16" PRIx64 " (%" PRIu64 ")\n", id, id);
 		break;
 	case AVRCP_EVENT_PLAYBACK_POS_CHANGED:
-		interval = get_u32(frm);
+		interval = p_get_u32(frm);
 		printf("Position: 0x%08x (%u miliseconds)\n", interval,
 								interval);
 		break;
 	case AVRCP_EVENT_BATT_STATUS_CHANGED:
-		status = get_u8(frm);
+		status = p_get_u8(frm);
 		printf("BatteryStatus: 0x%02x (%s)\n", status,
 							status2str(status));
 		break;
 	case AVRCP_EVENT_SYSTEM_STATUS_CHANGED:
-		status = get_u8(frm);
+		status = p_get_u8(frm);
 		printf("SystemStatus: 0x%02x ", status);
 		switch (status) {
 		case 0x00:
@@ -1193,7 +1193,7 @@ response:
 		}
 		break;
 	case AVRCP_EVENT_PLAYER_APPLICATION_SETTING_CHANGED:
-		status = get_u8(frm);
+		status = p_get_u8(frm);
 		printf("AttributeCount: 0x%02x\n", status);
 
 		for (; status > 0; status--) {
@@ -1201,33 +1201,33 @@ response:
 
 			p_indent(level, frm);
 
-			attr = get_u8(frm);
+			attr = p_get_u8(frm);
 			printf("AttributeID: 0x%02x (%s)\n", attr,
 							attr2str(attr));
 
 			p_indent(level, frm);
 
-			value = get_u8(frm);
+			value = p_get_u8(frm);
 			printf("ValueID: 0x%02x (%s)\n", value,
 						value2str(attr, value));
 		}
 		break;
 	case AVRCP_EVENT_VOLUME_CHANGED:
-		status = get_u8(frm) & 0x7F;
+		status = p_get_u8(frm) & 0x7F;
 		printf("Volume: %.2f%% (%d/127)\n", status/1.27, status);
 		break;
 	case AVRCP_EVENT_ADDRESSED_PLAYER_CHANGED:
-		uid = get_u16(frm);
+		uid = p_get_u16(frm);
 		printf("PlayerID: 0x%04x (%u)\n", uid, uid);
 
 
 		p_indent(level, frm);
 
-		uid = get_u16(frm);
+		uid = p_get_u16(frm);
 		printf("UIDCounter: 0x%04x (%u)\n", uid, uid);
 		break;
 	case AVRCP_EVENT_UIDS_CHANGED:
-		uid = get_u16(frm);
+		uid = p_get_u16(frm);
 		printf("UIDCounter: 0x%04x (%u)\n", uid, uid);
 		break;
 	}
@@ -1246,7 +1246,7 @@ static void avrcp_set_absolute_volume_dump(int level, struct frame *frm,
 		return;
 	}
 
-	value = get_u8(frm) & 0x7F;
+	value = p_get_u8(frm) & 0x7F;
 	printf("Volume: %.2f%% (%d/127)\n", value/1.27, value);
 }
 
@@ -1267,7 +1267,7 @@ static void avrcp_set_addressed_player(int level, struct frame *frm,
 		return;
 	}
 
-	id = get_u16(frm);
+	id = p_get_u16(frm);
 	printf("PlayerID: 0x%04x (%u)\n", id, id);
 	return;
 
@@ -1278,7 +1278,7 @@ response:
 		return;
 	}
 
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("Status: 0x%02x (%s)\n", status, error2str(status));
 }
 
@@ -1300,7 +1300,7 @@ static void avrcp_set_browsed_player_dump(int level, struct frame *frm,
 		return;
 	}
 
-	id = get_u16(frm);
+	id = p_get_u16(frm);
 	printf("PlayerID: 0x%04x (%u)\n", id, id);
 	return;
 
@@ -1311,7 +1311,7 @@ response:
 		return;
 	}
 
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("Status: 0x%02x (%s)\n", status, error2str(status));
 
 	if (len == 1)
@@ -1319,22 +1319,22 @@ response:
 
 	p_indent(level, frm);
 
-	uids = get_u16(frm);
+	uids = p_get_u16(frm);
 	printf("UIDCounter: 0x%04x (%u)\n", uids, uids);
 
 	p_indent(level, frm);
 
-	items = get_u32(frm);
+	items = p_get_u32(frm);
 	printf("Number of Items: 0x%08x (%u)\n", items, items);
 
 	p_indent(level, frm);
 
-	charset = get_u16(frm);
+	charset = p_get_u16(frm);
 	printf("CharsetID: 0x%04x (%s)\n", charset, charset2str(charset));
 
 	p_indent(level, frm);
 
-	folders = get_u8(frm);
+	folders = p_get_u8(frm);
 	printf("Folder Depth: 0x%02x (%u)\n", folders, folders);
 
 	for (; folders > 0; folders--) {
@@ -1342,10 +1342,10 @@ response:
 
 		p_indent(level, frm);
 
-		len = get_u8(frm);
+		len = p_get_u8(frm);
 		printf("Folder: ");
 		for (; len > 0; len--) {
-			uint8_t c = get_u8(frm);
+			uint8_t c = p_get_u8(frm);
 			printf("%1c", isprint(c) ? c : '.');
 		}
 		printf("\n");
@@ -1386,23 +1386,23 @@ static void avrcp_play_item_dump(int level, struct frame *frm,
 		return;
 	}
 
-	scope = get_u8(frm);
+	scope = p_get_u8(frm);
 	printf("Scope: 0x%02x (%s)\n", scope, scope2str(scope));
 
 	p_indent(level, frm);
 
-	uid = get_u64(frm);
+	uid = p_get_u64(frm);
 	printf("UID: 0x%16" PRIx64 " (%" PRIu64 ")\n", uid, uid);
 
 	p_indent(level, frm);
 
-	uidcounter = get_u16(frm);
+	uidcounter = p_get_u16(frm);
 	printf("UIDCounter: 0x%04x (%u)\n", uidcounter, uidcounter);
 
 	return;
 
 response:
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("Status: 0x%02x (%s)\n", status, error2str(status));
 }
 
@@ -1424,23 +1424,23 @@ static void avrcp_add_to_now_playing_dump(int level, struct frame *frm,
 		return;
 	}
 
-	scope = get_u8(frm);
+	scope = p_get_u8(frm);
 	printf("Scope: 0x%02x (%s)\n", scope, scope2str(scope));
 
 	p_indent(level, frm);
 
-	uid = get_u64(frm);
+	uid = p_get_u64(frm);
 	printf("UID: 0x%16" PRIx64 " (%" PRIu64 ")\n", uid, uid);
 
 	p_indent(level, frm);
 
-	uidcounter = get_u16(frm);
+	uidcounter = p_get_u16(frm);
 	printf("UIDCounter: 0x%04x (%u)\n", uidcounter, uidcounter);
 
 	return;
 
 response:
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("Status: 0x%02x (%s)\n", status, error2str(status));
 }
 
@@ -1451,9 +1451,9 @@ static void avrcp_pdu_dump(int level, struct frame *frm, uint8_t ctype)
 
 	p_indent(level, frm);
 
-	pduid = get_u8(frm);
-	pt = get_u8(frm);
-	len = get_u16(frm);
+	pduid = p_get_u8(frm);
+	pt = p_get_u8(frm);
+	len = p_get_u16(frm);
 
 	printf("AVRCP: %s: pt %s len 0x%04x\n", pdu2str(pduid),
 							pt2str(pt), len);
@@ -1566,13 +1566,13 @@ static void avrcp_passthrough_dump(int level, struct frame *frm)
 
 	p_indent(level, frm);
 
-	op = get_u8(frm);
+	op = p_get_u8(frm);
 	printf("Operation: 0x%02x (%s %s)\n", op, op2str(op),
 					op & 0x80 ? "Released" : "Pressed");
 
 	p_indent(level, frm);
 
-	len = get_u8(frm);
+	len = p_get_u8(frm);
 
 	printf("Lenght: 0x%02x\n", len);
 
@@ -1683,46 +1683,46 @@ static void avrcp_media_player_item_dump(int level, struct frame *frm,
 		return;
 	}
 
-	id = get_u16(frm);
+	id = p_get_u16(frm);
 	printf("PlayerID: 0x%04x (%u)\n", id, id);
 
 	p_indent(level, frm);
 
-	type = get_u8(frm);
+	type = p_get_u8(frm);
 	printf("PlayerType: 0x%04x (%s)\n", type, playertype2str(type));
 
 	p_indent(level, frm);
 
-	subtype = get_u32(frm);
+	subtype = p_get_u32(frm);
 	printf("PlayerSubtype: 0x%08x (%s)\n", subtype,
 						playersubtype2str(subtype));
 
 	p_indent(level, frm);
 
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("PlayStatus: 0x%02x (%s)\n", status, playstatus2str(status));
 
 	p_indent(level, frm);
 
-	get_u128(frm, &features[0], &features[1]);
+	p_get_u128(frm, &features[0], &features[1]);
 	printf("Features: 0x%16" PRIx64 "%16" PRIx64 "\n", features[1],
 								features[0]);
 
 	p_indent(level, frm);
 
-	charset = get_u16(frm);
+	charset = p_get_u16(frm);
 	printf("CharsetID: 0x%04x (%s)\n", charset, charset2str(charset));
 
 	p_indent(level, frm);
 
-	namelen = get_u16(frm);
+	namelen = p_get_u16(frm);
 	printf("NameLength: 0x%04x (%u)\n", namelen, namelen);
 
 	p_indent(level, frm);
 
 	printf("Name: ");
 	for (; namelen > 0; namelen--) {
-		uint8_t c = get_u8(frm);
+		uint8_t c = p_get_u8(frm);
 		printf("%1c", isprint(c) ? c : '.');
 	}
 	printf("\n");
@@ -1764,35 +1764,35 @@ static void avrcp_folder_item_dump(int level, struct frame *frm, uint16_t len)
 		return;
 	}
 
-	uid = get_u64(frm);
+	uid = p_get_u64(frm);
 	printf("FolderUID: 0x%16" PRIx64 " (%" PRIu64 ")\n", uid, uid);
 
 	p_indent(level, frm);
 
-	type = get_u8(frm);
+	type = p_get_u8(frm);
 	printf("FolderType: 0x%02x (%s)\n", type, foldertype2str(type));
 
 	p_indent(level, frm);
 
-	playable = get_u8(frm);
+	playable = p_get_u8(frm);
 	printf("IsPlayable: 0x%02x (%s)\n", playable,
 					playable & 0x01 ? "True" : "False");
 
 	p_indent(level, frm);
 
-	charset = get_u16(frm);
+	charset = p_get_u16(frm);
 	printf("CharsetID: 0x%04x (%s)\n", charset, charset2str(charset));
 
 	p_indent(level, frm);
 
-	namelen = get_u16(frm);
+	namelen = p_get_u16(frm);
 	printf("NameLength: 0x%04x (%u)\n", namelen, namelen);
 
 	p_indent(level, frm);
 
 	printf("Name: ");
 	for (; namelen > 0; namelen--) {
-		uint8_t c = get_u8(frm);
+		uint8_t c = p_get_u8(frm);
 		printf("%1c", isprint(c) ? c : '.');
 	}
 	printf("\n");
@@ -1820,25 +1820,25 @@ static void avrcp_attribute_entry_list_dump(int level, struct frame *frm,
 
 		p_indent(level, frm);
 
-		attr = get_u32(frm);
+		attr = p_get_u32(frm);
 		printf("AttributeID: 0x%08x (%s)\n", attr, mediattr2str(attr));
 
 		p_indent(level, frm);
 
-		charset = get_u16(frm);
+		charset = p_get_u16(frm);
 		printf("CharsetID: 0x%04x (%s)\n", charset,
 							charset2str(charset));
 
 		p_indent(level, frm);
 
-		len = get_u16(frm);
+		len = p_get_u16(frm);
 		printf("AttributeLength: 0x%04x (%u)\n", len, len);
 
 		p_indent(level, frm);
 
 		printf("AttributeValue: ");
 		for (; len > 0; len--) {
-			uint8_t c = get_u8(frm);
+			uint8_t c = p_get_u8(frm);
 			printf("%1c", isprint(c) ? c : '.');
 		}
 		printf("\n");
@@ -1860,36 +1860,36 @@ static void avrcp_media_element_item_dump(int level, struct frame *frm,
 		return;
 	}
 
-	uid = get_u64(frm);
+	uid = p_get_u64(frm);
 	printf("ElementUID: 0x%16" PRIx64 " (%" PRIu64 ")\n", uid, uid);
 
 	p_indent(level, frm);
 
-	type = get_u8(frm);
+	type = p_get_u8(frm);
 	printf("ElementType: 0x%02x (%s)\n", type, elementtype2str(type));
 
 	p_indent(level, frm);
 
-	charset = get_u16(frm);
+	charset = p_get_u16(frm);
 	printf("CharsetID: 0x%04x (%s)\n", charset, charset2str(charset));
 
 	p_indent(level, frm);
 
-	namelen = get_u16(frm);
+	namelen = p_get_u16(frm);
 	printf("NameLength: 0x%04x (%u)\n", namelen, namelen);
 
 	p_indent(level, frm);
 
 	printf("Name: ");
 	for (; namelen > 0; namelen--) {
-		uint8_t c = get_u8(frm);
+		uint8_t c = p_get_u8(frm);
 		printf("%1c", isprint(c) ? c : '.');
 	}
 	printf("\n");
 
 	p_indent(level, frm);
 
-	count = get_u8(frm);
+	count = p_get_u8(frm);
 	printf("AttributeCount: 0x%02x (%u)\n", count, count);
 
 	avrcp_attribute_entry_list_dump(level, frm, count);
@@ -1913,22 +1913,22 @@ static void avrcp_get_folder_items_dump(int level, struct frame *frm,
 		return;
 	}
 
-	scope = get_u8(frm);
+	scope = p_get_u8(frm);
 	printf("Scope: 0x%02x (%s)\n", scope, scope2str(scope));
 
 	p_indent(level, frm);
 
-	start = get_u32(frm);
+	start = p_get_u32(frm);
 	printf("StartItem: 0x%08x (%u)\n", start, start);
 
 	p_indent(level, frm);
 
-	end = get_u32(frm);
+	end = p_get_u32(frm);
 	printf("EndItem: 0x%08x (%u)\n", end, end);
 
 	p_indent(level, frm);
 
-	count = get_u8(frm);
+	count = p_get_u8(frm);
 	printf("AttributeCount: 0x%02x (%u)\n", count, count);
 
 	for (; count > 0; count--) {
@@ -1936,14 +1936,14 @@ static void avrcp_get_folder_items_dump(int level, struct frame *frm,
 
 		p_indent(level, frm);
 
-		attr = get_u32(frm);
+		attr = p_get_u32(frm);
 		printf("AttributeID: 0x%08x (%s)\n", attr, mediattr2str(attr));
 	}
 
 	return;
 
 response:
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("Status: 0x%02x (%s)\n", status, error2str(status));
 
 	if (len == 1)
@@ -1951,12 +1951,12 @@ response:
 
 	p_indent(level, frm);
 
-	uid = get_u16(frm);
+	uid = p_get_u16(frm);
 	printf("UIDCounter: 0x%04x (%u)\n", uid, uid);
 
 	p_indent(level, frm);
 
-	num = get_u16(frm);
+	num = p_get_u16(frm);
 	printf("Number of Items: 0x%04x (%u)\n", num, num);
 
 	for (; num > 0; num--) {
@@ -1965,8 +1965,8 @@ response:
 
 		p_indent(level, frm);
 
-		type = get_u8(frm);
-		len = get_u16(frm);
+		type = p_get_u8(frm);
+		len = p_get_u16(frm);
 		switch (type) {
 		case 0x01:
 			printf("Item: 0x01 (Media Player)) ");
@@ -2018,23 +2018,23 @@ static void avrcp_change_path_dump(int level, struct frame *frm, uint8_t hdr,
 		return;
 	}
 
-	uidcounter = get_u16(frm);
+	uidcounter = p_get_u16(frm);
 	printf("UIDCounter: 0x%04x (%u)\n", uidcounter, uidcounter);
 
 	p_indent(level, frm);
 
-	dir = get_u8(frm);
+	dir = p_get_u8(frm);
 	printf("Direction: 0x%02x (%s)\n", dir, dir2str(dir));
 
 	p_indent(level, frm);
 
-	uid = get_u64(frm);
+	uid = p_get_u64(frm);
 	printf("FolderUID: 0x%16" PRIx64 " (%" PRIu64 ")\n", uid, uid);
 
 	return;
 
 response:
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("Status: 0x%02x (%s)\n", status, error2str(status));
 
 	if (len == 1)
@@ -2042,7 +2042,7 @@ response:
 
 	p_indent(level, frm);
 
-	items = get_u32(frm);
+	items = p_get_u32(frm);
 	printf("Number of Items: 0x%04x (%u)", items, items);
 }
 
@@ -2064,22 +2064,22 @@ static void avrcp_get_item_attributes_dump(int level, struct frame *frm,
 		return;
 	}
 
-	scope = get_u8(frm);
+	scope = p_get_u8(frm);
 	printf("Scope: 0x%02x (%s)\n", scope, scope2str(scope));
 
 	p_indent(level, frm);
 
-	uid = get_u64(frm);
+	uid = p_get_u64(frm);
 	printf("UID: 0x%16" PRIx64 " (%" PRIu64 ")\n", uid, uid);
 
 	p_indent(level, frm);
 
-	uidcounter = get_u16(frm);
+	uidcounter = p_get_u16(frm);
 	printf("UIDCounter: 0x%04x (%u)\n", uidcounter, uidcounter);
 
 	p_indent(level, frm);
 
-	count = get_u8(frm);
+	count = p_get_u8(frm);
 	printf("AttributeCount: 0x%02x (%u)\n", count, count);
 
 	for (; count > 0; count--) {
@@ -2087,14 +2087,14 @@ static void avrcp_get_item_attributes_dump(int level, struct frame *frm,
 
 		p_indent(level, frm);
 
-		attr = get_u32(frm);
+		attr = p_get_u32(frm);
 		printf("AttributeID: 0x%08x (%s)\n", attr, mediattr2str(attr));
 	}
 
 	return;
 
 response:
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("Status: 0x%02x (%s)\n", status, error2str(status));
 
 	if (len == 1)
@@ -2102,7 +2102,7 @@ response:
 
 	p_indent(level, frm);
 
-	count = get_u8(frm);
+	count = p_get_u8(frm);
 	printf("AttributeCount: 0x%02x (%u)\n", count, count);
 
 	avrcp_attribute_entry_list_dump(level, frm, count);
@@ -2126,19 +2126,19 @@ static void avrcp_search_dump(int level, struct frame *frm, uint8_t hdr,
 		return;
 	}
 
-	charset = get_u16(frm);
+	charset = p_get_u16(frm);
 	printf("CharsetID: 0x%04x (%s)\n", charset, charset2str(charset));
 
 	p_indent(level, frm);
 
-	namelen = get_u16(frm);
+	namelen = p_get_u16(frm);
 	printf("Length: 0x%04x (%u)\n", namelen, namelen);
 
 	p_indent(level, frm);
 
 	printf("String: ");
 	for (; namelen > 0; namelen--) {
-		uint8_t c = get_u8(frm);
+		uint8_t c = p_get_u8(frm);
 		printf("%1c", isprint(c) ? c : '.');
 	}
 	printf("\n");
@@ -2146,7 +2146,7 @@ static void avrcp_search_dump(int level, struct frame *frm, uint8_t hdr,
 	return;
 
 response:
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("Status: 0x%02x (%s)\n", status, error2str(status));
 
 	if (len == 1)
@@ -2154,12 +2154,12 @@ response:
 
 	p_indent(level, frm);
 
-	uidcounter = get_u16(frm);
+	uidcounter = p_get_u16(frm);
 	printf("UIDCounter: 0x%04x (%u)\n", uidcounter, uidcounter);
 
 	p_indent(level, frm);
 
-	items = get_u32(frm);
+	items = p_get_u32(frm);
 	printf("Number of Items: 0x%04x (%u)", items, items);
 }
 
@@ -2178,7 +2178,7 @@ static void avrcp_general_reject_dump(int level, struct frame *frm,
 	return;
 
 response:
-	status = get_u8(frm);
+	status = p_get_u8(frm);
 	printf("Status: 0x%02x (%s)\n", status, error2str(status));
 }
 
@@ -2187,8 +2187,8 @@ static void avrcp_browsing_dump(int level, struct frame *frm, uint8_t hdr)
 	uint8_t pduid;
 	uint16_t len;
 
-	pduid = get_u8(frm);
-	len = get_u16(frm);
+	pduid = p_get_u8(frm);
+	len = p_get_u16(frm);
 
 	printf("AVRCP: %s: len 0x%04x\n", pdu2str(pduid), len);
 
@@ -2228,9 +2228,9 @@ static void avrcp_control_dump(int level, struct frame *frm)
 	uint8_t ctype, address, subunit, opcode, company[3];
 	int i;
 
-	ctype = get_u8(frm);
-	address = get_u8(frm);
-	opcode = get_u8(frm);
+	ctype = p_get_u8(frm);
+	address = p_get_u8(frm);
+	opcode = p_get_u8(frm);
 
 	printf("AV/C: %s: address 0x%02x opcode 0x%02x\n", ctype2str(ctype),
 							address, opcode);
@@ -2265,7 +2265,7 @@ static void avrcp_control_dump(int level, struct frame *frm)
 
 		printf("Company ID: 0x");
 		for (i = 0; i < 3; i++) {
-			company[i] = get_u8(frm);
+			company[i] = p_get_u8(frm);
 			printf("%02x", company[i]);
 		}
 		printf("\n");
diff --git a/tools/parser/bnep.c b/tools/parser/bnep.c
index d9e958d..7c549f4 100644
--- a/tools/parser/bnep.c
+++ b/tools/parser/bnep.c
@@ -79,48 +79,48 @@ static void bnep_control(int level, struct frame *frm, int header_length)
 	int i, length;
 	char *s;
 	uint32_t uuid = 0;
-	uint8_t type = get_u8(frm);
+	uint8_t type = p_get_u8(frm);
 
 	p_indent(++level, frm);
 	switch (type) {
 	case BNEP_CONTROL_COMMAND_NOT_UNDERSTOOD:
-		printf("Not Understood(0x%02x) type 0x%02x\n", type, get_u8(frm));
+		printf("Not Understood(0x%02x) type 0x%02x\n", type, p_get_u8(frm));
 		break;
 
 	case BNEP_SETUP_CONNECTION_REQUEST_MSG:
-		uuid_size = get_u8(frm);
+		uuid_size = p_get_u8(frm);
 		printf("Setup Req(0x%02x) size 0x%02x ", type, uuid_size);
 		switch (uuid_size) {
 		case 2:
-			uuid = get_u16(frm);
+			uuid = p_get_u16(frm);
 			printf("dst 0x%x", uuid);
 			if ((s = get_uuid_name(uuid)) != 0)
 				printf("(%s)", s);
-			uuid = get_u16(frm);
+			uuid = p_get_u16(frm);
 			printf(" src 0x%x", uuid);
 			if ((s = get_uuid_name(uuid)) != 0)
 				printf("(%s)", s);
 			printf("\n");
 			break;
 		case 4:
-			uuid = get_u32(frm);
+			uuid = p_get_u32(frm);
 			printf("dst 0x%x", uuid);
 			if ((s = get_uuid_name(uuid)) != 0)
 				printf("(%s)", s);
-			uuid = get_u32(frm);
+			uuid = p_get_u32(frm);
 			printf(" src 0x%x", uuid);
 			if ((s = get_uuid_name(uuid)) != 0)
 				printf("(%s)", s);
 			printf("\n");
 			break;
 		case 16:
-			uuid = get_u32(frm);
+			uuid = p_get_u32(frm);
 			printf("dst 0x%x", uuid);
 			if ((s = get_uuid_name(uuid)) != 0)
 				printf("(%s)", s);
 			frm->ptr += 12;
 			frm->len -= 12;
-			uuid = get_u32(frm);
+			uuid = p_get_u32(frm);
 			printf(" src 0x%x", uuid);
 			if ((s = get_uuid_name(uuid)) != 0)
 				printf("(%s)", s);
@@ -137,27 +137,27 @@ static void bnep_control(int level, struct frame *frm, int header_length)
 
 	case BNEP_SETUP_CONNECTION_RESPONSE_MSG:
 		printf("Setup Rsp(0x%02x) res 0x%04x\n",
-						type, get_u16(frm));
+						type, p_get_u16(frm));
 		break;
 
 	case BNEP_FILTER_NET_TYPE_SET_MSG:
-		length = get_u16(frm);
+		length = p_get_u16(frm);
 		printf("Filter NetType Set(0x%02x) len 0x%04x\n",
 							type, length);
 		for (i = 0; i < length / 4; i++) {
 			p_indent(level + 1, frm);
-			printf("0x%04x - ", get_u16(frm));
-			printf("0x%04x\n", get_u16(frm));
+			printf("0x%04x - ", p_get_u16(frm));
+			printf("0x%04x\n", p_get_u16(frm));
 		}
 		break;
 
 	case BNEP_FILTER_NET_TYPE_RESPONSE_MSG:
 		printf("Filter NetType Rsp(0x%02x) res 0x%04x\n",
-							type, get_u16(frm));
+							type, p_get_u16(frm));
 		break;
 
 	case BNEP_FILTER_MULT_ADDR_SET_MSG:
-		length = get_u16(frm);
+		length = p_get_u16(frm);
 		printf("Filter MultAddr Set(0x%02x) len 0x%04x\n",
 							type, length);
 		for (i = 0; i < length / 12; i++) {
@@ -169,7 +169,7 @@ static void bnep_control(int level, struct frame *frm, int header_length)
 
 	case BNEP_FILTER_MULT_ADDR_RESPONSE_MSG:
 		printf("Filter MultAddr Rsp(0x%02x) res 0x%04x\n",
-							type, get_u16(frm));
+							type, p_get_u16(frm));
 		break;
 
 	default:
@@ -183,8 +183,8 @@ static void bnep_control(int level, struct frame *frm, int header_length)
 
 static void bnep_eval_extension(int level, struct frame *frm)
 {
-	uint8_t type = get_u8(frm);
-	uint8_t length = get_u8(frm);
+	uint8_t type = p_get_u8(frm);
+	uint8_t length = p_get_u8(frm);
 	int extension = type & 0x80;
 
 	p_indent(level, frm);
@@ -210,7 +210,7 @@ static void bnep_eval_extension(int level, struct frame *frm)
 
 void bnep_dump(int level, struct frame *frm)
 {
-	uint8_t type = get_u8(frm);
+	uint8_t type = p_get_u8(frm);
 	uint16_t proto = 0x0000;
 	int extension = type & 0x80;
 
@@ -227,7 +227,7 @@ void bnep_dump(int level, struct frame *frm)
 		printf("BNEP: Compressed(0x%02x|%s)\n",
 					type & 0x7f, extension ? "1" : "0");
 		p_indent(++level, frm);
-		proto = get_u16(frm);
+		proto = p_get_u16(frm);
 		printf("[proto 0x%04x]\n", proto);
 		break;
 
@@ -237,7 +237,7 @@ void bnep_dump(int level, struct frame *frm)
 		p_indent(++level, frm);
 		printf("dst %s ", get_macaddr(frm));
 		printf("src %s ", get_macaddr(frm));
-		proto = get_u16(frm);
+		proto = p_get_u16(frm);
 		printf("[proto 0x%04x]\n", proto);
 		break;
 
@@ -246,7 +246,7 @@ void bnep_dump(int level, struct frame *frm)
 					type & 0x7f, extension ? "1" : "0");
 		p_indent(++level, frm);
 		printf("dst %s ", get_macaddr(frm));
-		proto = get_u16(frm);
+		proto = p_get_u16(frm);
 		printf("[proto 0x%04x]\n", proto);
 		break;
 
@@ -255,7 +255,7 @@ void bnep_dump(int level, struct frame *frm)
 					type & 0x7f, extension ? "1" : "0");
 		p_indent(++level, frm);
 		printf("src %s ", get_macaddr(frm));
-		proto = get_u16(frm);
+		proto = p_get_u16(frm);
 		printf("[proto 0x%04x]\n", proto);
 		break;
 
@@ -275,8 +275,8 @@ void bnep_dump(int level, struct frame *frm)
 	/* 802.1p header */
 	if (proto == 0x8100) {
 		p_indent(level, frm);
-		printf("802.1p Header: 0x%04x ", get_u16(frm));
-		proto = get_u16(frm);
+		printf("802.1p Header: 0x%04x ", p_get_u16(frm));
+		proto = p_get_u16(frm);
 		printf("[proto 0x%04x]\n", proto);
 	}
 
diff --git a/tools/parser/bpa.c b/tools/parser/bpa.c
index 207397f..74a3457 100644
--- a/tools/parser/bpa.c
+++ b/tools/parser/bpa.c
@@ -33,9 +33,9 @@
 
 #include "parser.h"
 
-#define BPA_U8(frm)  (get_u8(frm))
-#define BPA_U16(frm) (btohs(htons(get_u16(frm))))
-#define BPA_U32(frm) (btohl(htonl(get_u32(frm))))
+#define BPA_U8(frm)  (p_get_u8(frm))
+#define BPA_U16(frm) (btohs(htons(p_get_u16(frm))))
+#define BPA_U32(frm) (btohl(htonl(p_get_u32(frm))))
 
 void bpa_dump(int level, struct frame *frm)
 {
@@ -43,13 +43,13 @@ void bpa_dump(int level, struct frame *frm)
 	uint16_t num, len;
 	uint32_t time;
 
-	id = get_u8(frm);
-	num = get_u16(frm);
+	id = p_get_u8(frm);
+	num = p_get_u16(frm);
 	len = BPA_U16(frm);
 
-	status  = get_u8(frm);
-	time    = get_u32(frm);
-	channel = get_u8(frm);
+	status  = p_get_u8(frm);
+	time    = p_get_u32(frm);
+	channel = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("BPA: id %d num %d len %u status 0x%02x time %d channel %d\n",
diff --git a/tools/parser/capi.c b/tools/parser/capi.c
index 97abc4c..b8d05c2 100644
--- a/tools/parser/capi.c
+++ b/tools/parser/capi.c
@@ -34,9 +34,9 @@
 
 #include "parser.h"
 
-#define CAPI_U8(frm)  (get_u8(frm))
-#define CAPI_U16(frm) (btohs(htons(get_u16(frm))))
-#define CAPI_U32(frm) (btohl(htonl(get_u32(frm))))
+#define CAPI_U8(frm)  (p_get_u8(frm))
+#define CAPI_U16(frm) (btohs(htons(p_get_u16(frm))))
+#define CAPI_U32(frm) (btohl(htonl(p_get_u32(frm))))
 
 static char *cmd2str(uint8_t cmd)
 {
@@ -718,7 +718,7 @@ static void cmd_data_b3(int level, uint8_t subcmd, struct frame *frm)
 		printf("Flags: 0x%04x\n", flags);
 
 		if (data == 0)
-			(void) get_u64(frm);
+			(void) p_get_u64(frm);
 
 		raw_dump(level, frm);
 	}
diff --git a/tools/parser/cmtp.c b/tools/parser/cmtp.c
index ac5cf84..ed5d13b 100644
--- a/tools/parser/cmtp.c
+++ b/tools/parser/cmtp.c
@@ -161,15 +161,15 @@ void cmtp_dump(int level, struct frame *frm)
 
 	while (frm->len > 0) {
 
-		hdr = get_u8(frm);
+		hdr = p_get_u8(frm);
 		bid = (hdr & 0x3c) >> 2;
 
 		switch ((hdr & 0xc0) >> 6) {
 		case 0x01:
-			len = get_u8(frm);
+			len = p_get_u8(frm);
 			break;
 		case 0x02:
-			len = htons(get_u16(frm));
+			len = htons(p_get_u16(frm));
 			break;
 		default:
 			len = 0;
diff --git a/tools/parser/csr.c b/tools/parser/csr.c
index 1a63ae0..a0a4eb5 100644
--- a/tools/parser/csr.c
+++ b/tools/parser/csr.c
@@ -33,10 +33,10 @@
 
 #include "parser.h"
 
-#define CSR_U8(frm)  (get_u8(frm))
-#define CSR_U16(frm) (btohs(htons(get_u16(frm))))
+#define CSR_U8(frm)  (p_get_u8(frm))
+#define CSR_U16(frm) (btohs(htons(p_get_u16(frm))))
 #define CSR_U32(frm) ((CSR_U16(frm) << 16) + CSR_U16(frm))
-#define CSR_S16(frm) (btohs(htons(get_u16(frm))))
+#define CSR_S16(frm) (btohs(htons(p_get_u16(frm))))
 
 static char *type2str(uint16_t type)
 {
diff --git a/tools/parser/ericsson.c b/tools/parser/ericsson.c
index a401959..3d52411 100644
--- a/tools/parser/ericsson.c
+++ b/tools/parser/ericsson.c
@@ -32,7 +32,7 @@
 
 void ericsson_dump(int level, struct frame *frm)
 {
-	uint8_t event = get_u8(frm);
+	uint8_t event = p_get_u8(frm);
 	uint8_t *buf = (uint8_t *) frm->ptr;
 
 	if (event != 0x10) {
diff --git a/tools/parser/hci.c b/tools/parser/hci.c
index 33df542..8c7bd25 100644
--- a/tools/parser/hci.c
+++ b/tools/parser/hci.c
@@ -833,7 +833,7 @@ static inline void ext_inquiry_response_dump(int level, struct frame *frm)
 	uint8_t length;
 
 	data = frm->ptr;
-	length = get_u8(frm);
+	length = p_get_u8(frm);
 
 	while (length > 0) {
 		ext_inquiry_data_dump(level, frm, data);
@@ -842,7 +842,7 @@ static inline void ext_inquiry_response_dump(int level, struct frame *frm)
 		frm->len -= length;
 
 		data = frm->ptr;
-		length = get_u8(frm);
+		length = p_get_u8(frm);
 	}
 
 	frm->ptr = ptr +
@@ -868,7 +868,7 @@ static inline void bdaddr_command_dump(int level, struct frame *frm)
 
 static inline void generic_command_dump(int level, struct frame *frm)
 {
-	uint16_t handle = btohs(htons(get_u16(frm)));
+	uint16_t handle = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("handle %d\n", handle);
@@ -878,7 +878,7 @@ static inline void generic_command_dump(int level, struct frame *frm)
 
 static inline void generic_write_mode_dump(int level, struct frame *frm)
 {
-	uint8_t mode = get_u8(frm);
+	uint8_t mode = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("mode 0x%2.2x\n", mode);
@@ -1213,7 +1213,7 @@ static inline void write_link_policy_dump(int level, struct frame *frm)
 
 static inline void write_default_link_policy_dump(int level, struct frame *frm)
 {
-	uint16_t policy = btohs(htons(get_u16(frm)));
+	uint16_t policy = btohs(htons(p_get_u16(frm)));
 	char *str;
 
 	p_indent(level, frm);
@@ -1327,7 +1327,7 @@ static inline void request_stored_link_key_dump(int level, struct frame *frm)
 
 static inline void return_link_keys_dump(int level, struct frame *frm)
 {
-	uint8_t num = get_u8(frm);
+	uint8_t num = p_get_u8(frm);
 	uint8_t key[16];
 	char addr[18];
 	int i, n;
@@ -1408,7 +1408,7 @@ static inline void write_current_iac_lap_dump(int level, struct frame *frm)
 
 static inline void write_scan_enable_dump(int level, struct frame *frm)
 {
-	uint8_t enable = get_u8(frm);
+	uint8_t enable = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("enable %d\n", enable);
@@ -1554,13 +1554,13 @@ static inline void host_buffer_size_dump(int level, struct frame *frm)
 
 static inline void num_comp_pkts_dump(int level, struct frame *frm)
 {
-	uint8_t num = get_u8(frm);
+	uint8_t num = p_get_u8(frm);
 	uint16_t handle, packets;
 	int i;
 
 	for (i = 0; i < num; i++) {
-		handle = btohs(htons(get_u16(frm)));
-		packets = btohs(htons(get_u16(frm)));
+		handle = btohs(htons(p_get_u16(frm)));
+		packets = btohs(htons(p_get_u16(frm)));
 
 		p_indent(level, frm);
 		printf("handle %d packets %d\n", handle, packets);
@@ -1695,7 +1695,7 @@ static inline void command_dump(int level, struct frame *frm)
 		return;
 
 	p_indent(level, frm);
-	printf("HCI Command: %s (0x%2.2x|0x%4.4x) plen %d\n", 
+	printf("HCI Command: %s (0x%2.2x|0x%4.4x) plen %d\n",
 				opcode2str(opcode), ogf, ocf, hdr->plen);
 
 	frm->ptr += HCI_COMMAND_HDR_SIZE;
@@ -2006,7 +2006,7 @@ static inline void command_dump(int level, struct frame *frm)
 
 static inline void status_response_dump(int level, struct frame *frm)
 {
-	uint8_t status = get_u8(frm);
+	uint8_t status = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("status 0x%2.2x\n", status);
@@ -2021,7 +2021,7 @@ static inline void status_response_dump(int level, struct frame *frm)
 
 static inline void handle_response_dump(int level, struct frame *frm)
 {
-	uint16_t handle = btohs(htons(get_u16(frm)));
+	uint16_t handle = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("handle %d\n", handle);
@@ -2031,7 +2031,7 @@ static inline void handle_response_dump(int level, struct frame *frm)
 
 static inline void bdaddr_response_dump(int level, struct frame *frm)
 {
-	uint8_t status = get_u8(frm);
+	uint8_t status = p_get_u8(frm);
 	bdaddr_t *bdaddr = frm->ptr;
 	char addr[18];
 
@@ -2070,8 +2070,8 @@ static inline void read_data_block_size_dump(int level, struct frame *frm)
 
 static inline void generic_response_dump(int level, struct frame *frm)
 {
-	uint8_t status = get_u8(frm);
-	uint16_t handle = btohs(htons(get_u16(frm)));
+	uint8_t status = p_get_u8(frm);
+	uint16_t handle = btohs(htons(p_get_u16(frm)));
 
 	p_indent(level, frm);
 	printf("status 0x%2.2x handle %d\n", status, handle);
@@ -2086,8 +2086,8 @@ static inline void generic_response_dump(int level, struct frame *frm)
 
 static inline void status_mode_dump(int level, struct frame *frm)
 {
-	uint8_t status = get_u8(frm);
-	uint8_t mode = get_u8(frm);
+	uint8_t status = p_get_u8(frm);
+	uint8_t mode = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("status 0x%2.2x mode 0x%2.2x\n", status, mode);
@@ -2123,8 +2123,8 @@ static inline void read_link_policy_dump(int level, struct frame *frm)
 
 static inline void read_default_link_policy_dump(int level, struct frame *frm)
 {
-	uint8_t status = get_u8(frm);
-	uint16_t policy = btohs(htons(get_u16(frm)));
+	uint8_t status = p_get_u8(frm);
+	uint16_t policy = btohs(htons(p_get_u16(frm)));
 	char *str;
 
 	p_indent(level, frm);
@@ -2270,8 +2270,8 @@ static inline void read_current_iac_lap_dump(int level, struct frame *frm)
 
 static inline void read_scan_enable_dump(int level, struct frame *frm)
 {
-	uint8_t status = get_u8(frm);
-	uint8_t enable = get_u8(frm);
+	uint8_t status = p_get_u8(frm);
+	uint8_t enable = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("status 0x%2.2x enable %d\n", status, enable);
@@ -3035,7 +3035,7 @@ static inline void hardware_error_dump(int level, struct frame *frm)
 
 static inline void inq_result_dump(int level, struct frame *frm)
 {
-	uint8_t num = get_u8(frm);
+	uint8_t num = p_get_u8(frm);
 	char addr[18];
 	int i;
 
@@ -3383,7 +3383,7 @@ static inline void flow_spec_complete_dump(int level, struct frame *frm)
 
 static inline void inq_result_with_rssi_dump(int level, struct frame *frm)
 {
-	uint8_t num = get_u8(frm);
+	uint8_t num = p_get_u8(frm);
 	char addr[18];
 	int i;
 
@@ -3502,7 +3502,7 @@ static inline void sniff_subrating_event_dump(int level, struct frame *frm)
 
 static inline void extended_inq_result_dump(int level, struct frame *frm)
 {
-	uint8_t num = get_u8(frm);
+	uint8_t num = p_get_u8(frm);
 	char addr[18];
 	int i;
 
@@ -3586,7 +3586,7 @@ static inline void evt_le_conn_complete_dump(int level, struct frame *frm)
 
 static inline void evt_le_advertising_report_dump(int level, struct frame *frm)
 {
-	uint8_t num_reports = get_u8(frm);
+	uint8_t num_reports = p_get_u8(frm);
 	const uint8_t RSSI_SIZE = 1;
 
 	while (num_reports--) {
@@ -4074,10 +4074,10 @@ static inline void vendor_dump(int level, struct frame *frm)
 		return;
 
 	if (frm->dev_id == HCI_DEV_NONE) {
-		uint16_t device = btohs(htons(get_u16(frm)));
-		uint16_t proto = btohs(htons(get_u16(frm)));
-		uint16_t type = btohs(htons(get_u16(frm)));
-		uint16_t plen = btohs(htons(get_u16(frm)));
+		uint16_t device = btohs(htons(p_get_u16(frm)));
+		uint16_t proto = btohs(htons(p_get_u16(frm)));
+		uint16_t type = btohs(htons(p_get_u16(frm)));
+		uint16_t plen = btohs(htons(p_get_u16(frm)));
 
 		p_indent(level, frm);
 
diff --git a/tools/parser/hcrp.c b/tools/parser/hcrp.c
index 0a16a22..444ec23 100644
--- a/tools/parser/hcrp.c
+++ b/tools/parser/hcrp.c
@@ -82,9 +82,9 @@ void hcrp_dump(int level, struct frame *frm)
 	uint16_t pid, tid, plen, status;
 	uint32_t credits;
 
-	pid = get_u16(frm);
-	tid = get_u16(frm);
-	plen = get_u16(frm);
+	pid = p_get_u16(frm);
+	tid = p_get_u16(frm);
+	plen = p_get_u16(frm);
 
 	p_indent(level, frm);
 
@@ -92,19 +92,19 @@ void hcrp_dump(int level, struct frame *frm)
 			pid2str(pid), frm->in ? "rsp" : "cmd",  tid, plen);
 
 	if (frm->in) {
-		status = get_u16(frm);
+		status = p_get_u16(frm);
 		printf(" status %d (%s)\n", status, status2str(status));
 	} else
 		printf("\n");
 
 	if (pid == 0x0001 && !frm->in) {
-		credits = get_u32(frm);
+		credits = p_get_u32(frm);
 		p_indent(level + 1, frm);
 		printf("credits %d\n", credits);
 	}
 
 	if (pid == 0x0002 && frm->in) {
-		credits = get_u32(frm);
+		credits = p_get_u32(frm);
 		p_indent(level + 1, frm);
 		printf("credits %d\n", credits);
 	}
diff --git a/tools/parser/hidp.c b/tools/parser/hidp.c
index 6039eb9..1adf8ed 100644
--- a/tools/parser/hidp.c
+++ b/tools/parser/hidp.c
@@ -136,7 +136,7 @@ void hidp_dump(int level, struct frame *frm)
 	uint8_t hdr;
 	char *param;
 
-	hdr = get_u8(frm);
+	hdr = p_get_u8(frm);
 
 	switch (hdr & 0xf0) {
 	case 0x00:
diff --git a/tools/parser/lmp.c b/tools/parser/lmp.c
index 3f65ace..3d2772c 100644
--- a/tools/parser/lmp.c
+++ b/tools/parser/lmp.c
@@ -34,9 +34,9 @@
 #include "lib/hci.h"
 #include "lib/hci_lib.h"
 
-#define LMP_U8(frm)  (get_u8(frm))
-#define LMP_U16(frm) (btohs(htons(get_u16(frm))))
-#define LMP_U32(frm) (btohl(htonl(get_u32(frm))))
+#define LMP_U8(frm)  (p_get_u8(frm))
+#define LMP_U16(frm) (btohs(htons(p_get_u16(frm))))
+#define LMP_U32(frm) (btohl(htonl(p_get_u32(frm))))
 
 static enum {
 	IN_RAND,
diff --git a/tools/parser/obex.c b/tools/parser/obex.c
index 66b7eff..0612c30 100644
--- a/tools/parser/obex.c
+++ b/tools/parser/obex.c
@@ -200,7 +200,7 @@ static void parse_headers(int level, struct frame *frm)
 	uint32_t hv32;
 
 	while (frm->len > 0) {
-		hi = get_u8(frm);
+		hi = p_get_u8(frm);
 
 		p_indent(level, frm);
 
@@ -212,7 +212,7 @@ static void parse_headers(int level, struct frame *frm)
 				return;
 			}
 
-			len = get_u16(frm) - 3;
+			len = p_get_u16(frm) - 3;
 			printf(" = Unicode length %d\n", len);
 
 			if (frm->len < len)
@@ -229,7 +229,7 @@ static void parse_headers(int level, struct frame *frm)
 				return;
 			}
 
-			len = get_u16(frm) - 3;
+			len = p_get_u16(frm) - 3;
 			printf(" = Sequence length %d\n", len);
 
 			if (frm->len < len)
@@ -246,7 +246,7 @@ static void parse_headers(int level, struct frame *frm)
 				return;
 			}
 
-			hv8 = get_u8(frm);
+			hv8 = p_get_u8(frm);
 			printf(" = %d\n", hv8);
 			break;
 
@@ -256,7 +256,7 @@ static void parse_headers(int level, struct frame *frm)
 				return;
 			}
 
-			hv32 = get_u32(frm);
+			hv32 = p_get_u32(frm);
 			printf(" = %u\n", hv32);
 			break;
 		}
@@ -272,8 +272,8 @@ void obex_dump(int level, struct frame *frm)
 	frm = add_frame(frm);
 
 	while (frm->len > 2) {
-		opcode = get_u8(frm);
-		length = get_u16(frm);
+		opcode = p_get_u8(frm);
+		length = p_get_u16(frm);
 		status = opcode & 0x7f;
 
 		if ((int) frm->len < length - 3) {
@@ -316,9 +316,9 @@ void obex_dump(int level, struct frame *frm)
 				return;
 			}
 
-			version = get_u8(frm);
-			flags   = get_u8(frm);
-			pktlen  = get_u16(frm);
+			version = p_get_u8(frm);
+			flags   = p_get_u8(frm);
+			pktlen  = p_get_u16(frm);
 			printf(" version %d.%d flags %d mtu %d\n",
 				version >> 4, version & 0xf, flags, pktlen);
 			break;
@@ -329,8 +329,8 @@ void obex_dump(int level, struct frame *frm)
 				return;
 			}
 
-			flags     = get_u8(frm);
-			constants = get_u8(frm);
+			flags     = p_get_u8(frm);
+			constants = p_get_u8(frm);
 			printf(" flags %d constants %d\n", flags, constants);
 			break;
 
diff --git a/tools/parser/parser.h b/tools/parser/parser.h
index 62b8ac5..b7e1d75 100644
--- a/tools/parser/parser.h
+++ b/tools/parser/parser.h
@@ -161,7 +161,7 @@ static inline void p_ba2str(const bdaddr_t *ba, char *str)
 
 /* get_uXX functions do byte swaping */
 
-static inline uint8_t get_u8(struct frame *frm)
+static inline uint8_t p_get_u8(struct frame *frm)
 {
 	uint8_t *u8_ptr = frm->ptr;
 	frm->ptr += 1;
@@ -169,7 +169,7 @@ static inline uint8_t get_u8(struct frame *frm)
 	return *u8_ptr;
 }
 
-static inline uint16_t get_u16(struct frame *frm)
+static inline uint16_t p_get_u16(struct frame *frm)
 {
 	uint16_t *u16_ptr = frm->ptr;
 	frm->ptr += 2;
@@ -177,7 +177,7 @@ static inline uint16_t get_u16(struct frame *frm)
 	return get_be16(u16_ptr);
 }
 
-static inline uint32_t get_u32(struct frame *frm)
+static inline uint32_t p_get_u32(struct frame *frm)
 {
 	uint32_t *u32_ptr = frm->ptr;
 	frm->ptr += 4;
@@ -185,7 +185,7 @@ static inline uint32_t get_u32(struct frame *frm)
 	return get_be32(u32_ptr);
 }
 
-static inline uint64_t get_u64(struct frame *frm)
+static inline uint64_t p_get_u64(struct frame *frm)
 {
 	uint64_t *u64_ptr = frm->ptr;
 	uint64_t u64 = get_unaligned(u64_ptr), tmp;
@@ -196,10 +196,10 @@ static inline uint64_t get_u64(struct frame *frm)
 	return u64;
 }
 
-static inline void get_u128(struct frame *frm, uint64_t *l, uint64_t *h)
+static inline void p_get_u128(struct frame *frm, uint64_t *l, uint64_t *h)
 {
-	*h = get_u64(frm);
-	*l = get_u64(frm);
+	*h = p_get_u64(frm);
+	*l = p_get_u64(frm);
 }
 
 char *get_uuid_name(int uuid);
diff --git a/tools/parser/ppp.c b/tools/parser/ppp.c
index 256e172..3847ff3 100644
--- a/tools/parser/ppp.c
+++ b/tools/parser/ppp.c
@@ -99,8 +99,8 @@ static inline char *proto2str(uint16_t proto)
 
 static void hdlc_dump(int level, struct frame *frm)
 {
-	uint8_t addr = get_u8(frm);
-	uint8_t ctrl = get_u8(frm);
+	uint8_t addr = p_get_u8(frm);
+	uint8_t ctrl = p_get_u8(frm);
 	uint16_t fcs, proto;
 
 	fcs = get_unaligned((uint16_t *) (frm->ptr + frm->len - 2));
@@ -118,9 +118,9 @@ static void hdlc_dump(int level, struct frame *frm)
 				dir2str(frm->in), addr, ctrl, frm->len, fcs);
 
 	if (*((uint8_t *) frm->ptr) & 0x80)
-		proto = get_u16(frm);
+		proto = p_get_u16(frm);
 	else
-		proto = get_u8(frm);
+		proto = p_get_u8(frm);
 
 	p_indent(level + 1, frm);
 	printf("PPP: %s (0x%04x): len %d\n", proto2str(proto), proto, frm->len);
diff --git a/tools/parser/sap.c b/tools/parser/sap.c
index 0c87c36..f51f0cc 100644
--- a/tools/parser/sap.c
+++ b/tools/parser/sap.c
@@ -273,35 +273,35 @@ static void parse_parameters(int level, struct frame *frm)
 	while (frm->len > 3) {
 		p_indent(level, frm);
 
-		param = get_u8(frm);
-		get_u8(frm);
-		len = get_u16(frm);
+		param = p_get_u8(frm);
+		p_get_u8(frm);
+		len = p_get_u16(frm);
 
 		printf("%s (0x%02x) len %d = ", param2str(param), param, len);
 
 		switch (param) {
 		case SAP_PARAM_ID_MAX_MSG_SIZE:
-			printf("%d\n", get_u16(frm));
+			printf("%d\n", p_get_u16(frm));
 			break;
 		case SAP_PARAM_ID_CONN_STATUS:
-			pv8 = get_u8(frm);
+			pv8 = p_get_u8(frm);
 			printf("0x%02x (%s)\n", pv8, status2str(pv8));
 			break;
 		case SAP_PARAM_ID_RESULT_CODE:
 		case SAP_PARAM_ID_CARD_READER_STATUS:
-			pv8 = get_u8(frm);
+			pv8 = p_get_u8(frm);
 			printf("0x%02x (%s)\n", pv8, result2str(pv8));
 			break;
 		case SAP_PARAM_ID_DISCONNECT_IND:
-			pv8 = get_u8(frm);
+			pv8 = p_get_u8(frm);
 			printf("0x%02x (%s)\n", pv8, disctype2str(pv8));
 			break;
 		case SAP_PARAM_ID_STATUS_CHANGE:
-			pv8 = get_u8(frm);
+			pv8 = p_get_u8(frm);
 			printf("0x%02x (%s)\n", pv8, statuschg2str(pv8));
 			break;
 		case SAP_PARAM_ID_TRANSPORT_PROTOCOL:
-			pv8 = get_u8(frm);
+			pv8 = p_get_u8(frm);
 			printf("0x%02x (%s)\n", pv8, prot2str(pv8));
 			break;
 		default:
@@ -321,11 +321,11 @@ void sap_dump(int level, struct frame *frm)
 {
 	uint8_t msg, params;
 
-	msg = get_u8(frm);
-	params = get_u8(frm);
+	msg = p_get_u8(frm);
+	params = p_get_u8(frm);
 
 	/* Skip reserved field */
-	get_u16(frm);
+	p_get_u16(frm);
 
 	p_indent(level, frm);
 
diff --git a/tools/parser/sdp.c b/tools/parser/sdp.c
index 0e28328..dba9a36 100644
--- a/tools/parser/sdp.c
+++ b/tools/parser/sdp.c
@@ -240,7 +240,7 @@ static inline char* get_attr_id_name(int attr_id)
 
 static inline uint8_t parse_de_hdr(struct frame *frm, int *n)
 {
-	uint8_t de_hdr = get_u8(frm);
+	uint8_t de_hdr = p_get_u8(frm);
 	uint8_t de_type = de_hdr >> 3;
 	uint8_t siz_idx = de_hdr & 0x07;
 
@@ -248,13 +248,13 @@ static inline uint8_t parse_de_hdr(struct frame *frm, int *n)
 	if (sdp_siz_idx_lookup_table[siz_idx].addl_bits) {
 		switch(sdp_siz_idx_lookup_table[siz_idx].num_bytes) {
 		case 1:
-			*n = get_u8(frm); break;
+			*n = p_get_u8(frm); break;
 		case 2:
-			*n = get_u16(frm); break;
+			*n = p_get_u16(frm); break;
 		case 4:
-			*n = get_u32(frm); break;
+			*n = p_get_u32(frm); break;
 		case 8:
-			*n = get_u64(frm); break;
+			*n = p_get_u64(frm); break;
 		}
 	} else
 		*n = sdp_siz_idx_lookup_table[siz_idx].num_bytes;
@@ -280,25 +280,25 @@ static inline void print_int(uint8_t de_type, int level, int n, struct frame *fr
 
 	switch(n) {
 	case 1: /* 8-bit */
-		val = get_u8(frm);
+		val = p_get_u8(frm);
 		if (channel && de_type == SDP_DE_UINT)
 			if (*channel == 0)
 				*channel = val;
 		break;
 	case 2: /* 16-bit */
-		val = get_u16(frm);
+		val = p_get_u16(frm);
 		if (psm && de_type == SDP_DE_UINT)
 			if (*psm == 0)
 				*psm = val;
 		break;
 	case 4: /* 32-bit */
-		val = get_u32(frm);
+		val = p_get_u32(frm);
 		break;
 	case 8: /* 64-bit */
-		val = get_u64(frm);
+		val = p_get_u64(frm);
 		break;
 	case 16:/* 128-bit */
-		get_u128(frm, &val, &val2);
+		p_get_u128(frm, &val, &val2);
 		printf(" 0x%jx", val2);
 		if (val < 0x1000000000000000LL)
 			printf("0");
@@ -322,11 +322,11 @@ static inline void print_uuid(int n, struct frame *frm, uint16_t *psm, uint8_t *
 
 	switch(n) {
 	case 2: /* 16-bit UUID */
-		uuid = get_u16(frm);
+		uuid = p_get_u16(frm);
 		s = "uuid-16";
 		break;
 	case 4: /* 32_bit UUID */
-		uuid = get_u32(frm);
+		uuid = p_get_u32(frm);
 		s = "uuid-32";
 		break;
 	case 16: /* 128-bit UUID */
@@ -483,14 +483,14 @@ static inline void print_attr_id_list(int level, struct frame *frm)
 				char *name;
 				switch(n2) {
 				case 2:
-					attr_id = get_u16(frm);
+					attr_id = p_get_u16(frm);
 					name = get_attr_id_name(attr_id);
 					if (!name)
 						name = "unknown";
 					printf(" 0x%04x (%s)", attr_id, name);
 					break;
 				case 4:
-					attr_id_range = get_u32(frm);
+					attr_id_range = p_get_u32(frm);
 					printf(" 0x%04x - 0x%04x",
 							(attr_id_range >> 16),
 							(attr_id_range & 0xFFFF));
@@ -520,7 +520,7 @@ static inline void print_attr_list(int level, struct frame *frm)
 			/* Print AttributeID */
 			if (parse_de_hdr(frm, &n2) == SDP_DE_UINT && n2 == sizeof(attr_id)) {
 				char *name;
-				attr_id = get_u16(frm);
+				attr_id = p_get_u16(frm);
 				p_indent(level, 0);
 				name = get_attr_id_name(attr_id);
 				if (!name)
@@ -685,7 +685,7 @@ void sdp_dump(int level, struct frame *frm)
 	switch (hdr->pid) {
 	case SDP_ERROR_RSP:
 		p_indent(level + 1, frm);
-		printf("code 0x%x info ", get_u16(frm));
+		printf("code 0x%x info ", p_get_u16(frm));
 		if (frm->len > 0)
 			hex_dump(0, frm, frm->len);
 		else
@@ -698,7 +698,7 @@ void sdp_dump(int level, struct frame *frm)
 
 		/* Parse MaximumServiceRecordCount */
 		p_indent(level + 1, frm);
-		printf("max %d\n", get_u16(frm));
+		printf("max %d\n", p_get_u16(frm));
 
 		/* Parse ContinuationState */
 		print_cont_state(level + 1, frm->ptr);
@@ -706,10 +706,10 @@ void sdp_dump(int level, struct frame *frm)
 
 	case SDP_SERVICE_SEARCH_RSP:
 		/* Parse TotalServiceRecordCount */
-		total = get_u16(frm);
+		total = p_get_u16(frm);
 
 		/* Parse CurrentServiceRecordCount */
-		count = get_u16(frm);
+		count = p_get_u16(frm);
 		p_indent(level + 1, frm);
 		if (count < total)
 			printf("count %d of %d\n", count, total);
@@ -722,7 +722,7 @@ void sdp_dump(int level, struct frame *frm)
 			p_indent(level + 1, frm);
 			printf("handle%s", count > 1 ? "s" : "");
 			for (i = 0; i < count; i++)
-				printf(" 0x%x", get_u32(frm));
+				printf(" 0x%x", p_get_u32(frm));
 			printf("\n");
 		}
 
@@ -733,11 +733,11 @@ void sdp_dump(int level, struct frame *frm)
 	case SDP_SERVICE_ATTR_REQ:
 		/* Parse ServiceRecordHandle */
 		p_indent(level + 1, frm);
-		printf("handle 0x%x\n", get_u32(frm));
+		printf("handle 0x%x\n", p_get_u32(frm));
 
 		/* Parse MaximumAttributeByteCount */
 		p_indent(level + 1, frm);
-		printf("max %d\n", get_u16(frm));
+		printf("max %d\n", p_get_u16(frm));
 
 		/* Parse ServiceSearchPattern */
 		print_attr_id_list(level + 1, frm);
@@ -748,7 +748,7 @@ void sdp_dump(int level, struct frame *frm)
 
 	case SDP_SERVICE_ATTR_RSP:
 		/* Parse AttributeByteCount */
-		count = get_u16(frm);
+		count = p_get_u16(frm);
 		p_indent(level + 1, frm);
 		printf("count %d\n", count);
 
@@ -770,7 +770,7 @@ void sdp_dump(int level, struct frame *frm)
 
 		/* Parse MaximumAttributeByteCount */
 		p_indent(level + 1, frm);
-		printf("max %d\n", get_u16(frm));
+		printf("max %d\n", p_get_u16(frm));
 
 		/* Parse AttributeList */
 		print_attr_id_list(level + 1, frm);
@@ -781,7 +781,7 @@ void sdp_dump(int level, struct frame *frm)
 
 	case SDP_SERVICE_SEARCH_ATTR_RSP:
 		/* Parse AttributeByteCount */
-		count = get_u16(frm);
+		count = p_get_u16(frm);
 		p_indent(level + 1, frm);
 		printf("count %d\n", count);
 
diff --git a/tools/parser/smp.c b/tools/parser/smp.c
index c81b585..97f02fa 100644
--- a/tools/parser/smp.c
+++ b/tools/parser/smp.c
@@ -151,12 +151,12 @@ static const char *smpreason2str(uint8_t reason)
 
 static void smp_cmd_pairing_dump(int level, struct frame *frm)
 {
-	uint8_t cap = get_u8(frm);
-	uint8_t oob = get_u8(frm);
-	uint8_t auth = get_u8(frm);
-	uint8_t key_size = get_u8(frm);
-	uint8_t int_dist = get_u8(frm);
-	uint8_t resp_dist = get_u8(frm);
+	uint8_t cap = p_get_u8(frm);
+	uint8_t oob = p_get_u8(frm);
+	uint8_t auth = p_get_u8(frm);
+	uint8_t key_size = p_get_u8(frm);
+	uint8_t int_dist = p_get_u8(frm);
+	uint8_t resp_dist = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("capability 0x%2.2x oob 0x%2.2x auth req 0x%2.2x\n", cap, oob,
@@ -196,7 +196,7 @@ static void smp_cmd_pairing_confirm_dump(int level, struct frame *frm)
 	p_indent(level, frm);
 	printf("key ");
 	for (i = 0; i < 16; i++)
-		printf("%2.2x", get_u8(frm));
+		printf("%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
@@ -207,13 +207,13 @@ static void smp_cmd_pairing_random_dump(int level, struct frame *frm)
 	p_indent(level, frm);
 	printf("random ");
 	for (i = 0; i < 16; i++)
-		printf("%2.2x", get_u8(frm));
+		printf("%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
 static void smp_cmd_pairing_failed_dump(int level, struct frame *frm)
 {
-	uint8_t reason = get_u8(frm);
+	uint8_t reason = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("reason 0x%2.2x\n", reason);
@@ -229,13 +229,13 @@ static void smp_cmd_encrypt_info_dump(int level, struct frame *frm)
 	p_indent(level, frm);
 	printf("LTK ");
 	for (i = 0; i < 16; i++)
-		printf("%2.2x", get_u8(frm));
+		printf("%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
 static void smp_cmd_master_ident_dump(int level, struct frame *frm)
 {
-	uint16_t ediv = btohs(htons(get_u16(frm)));
+	uint16_t ediv = btohs(htons(p_get_u16(frm)));
 	int i;
 
 	p_indent(level, frm);
@@ -243,7 +243,7 @@ static void smp_cmd_master_ident_dump(int level, struct frame *frm)
 
 	printf("Rand 0x");
 	for (i = 0; i < 8; i++)
-		printf("%2.2x", get_u8(frm));
+		printf("%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
@@ -254,13 +254,13 @@ static void smp_cmd_ident_info_dump(int level, struct frame *frm)
 	p_indent(level, frm);
 	printf("IRK ");
 	for (i = 0; i < 16; i++)
-		printf("%2.2x", get_u8(frm));
+		printf("%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
 static void smp_cmd_ident_addr_info_dump(int level, struct frame *frm)
 {
-	uint8_t type = get_u8(frm);
+	uint8_t type = p_get_u8(frm);
 	char addr[18];
 
 	p_indent(level, frm);
@@ -275,13 +275,13 @@ static void smp_cmd_sign_info_dump(int level, struct frame *frm)
 	p_indent(level, frm);
 	printf("CSRK ");
 	for (i = 0; i < 16; i++)
-		printf("%2.2x", get_u8(frm));
+		printf("%2.2x", p_get_u8(frm));
 	printf("\n");
 }
 
 static void smp_cmd_security_req_dump(int level, struct frame *frm)
 {
-	uint8_t auth = get_u8(frm);
+	uint8_t auth = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("auth req 0x%2.2x\n", auth);
@@ -291,7 +291,7 @@ void smp_dump(int level, struct frame *frm)
 {
 	uint8_t cmd;
 
-	cmd = get_u8(frm);
+	cmd = p_get_u8(frm);
 
 	p_indent(level, frm);
 	printf("SMP: %s (0x%.2x)\n", smpcmd2str(cmd), cmd);