diff --git a/test/bdaddr.c b/test/bdaddr.c
index f87fa38..73dffce 100644
--- a/test/bdaddr.c
+++ b/test/bdaddr.c
@@ -318,7 +318,7 @@ int main(int argc, char *argv[])
 	struct hci_dev_info di;
 	struct hci_version ver;
 	bdaddr_t bdaddr;
-	char addr[18], oui[9], *comp;
+	char addr[18], *comp;
 	int i, dd, opt, dev = 0, reset = 0;
 
 	bacpy(&bdaddr, BDADDR_ANY);
@@ -386,8 +386,7 @@ int main(int argc, char *argv[])
 	printf("Manufacturer:   %s (%d)\n",
 			bt_compidtostr(ver.manufacturer), ver.manufacturer);
 
-	ba2oui(&bdaddr, oui);
-	comp = ouitocomp(oui);
+	comp = batocomp(&bdaddr);
 
 	ba2str(&bdaddr, addr);
 	printf("Device address: %s", addr);
@@ -411,8 +410,7 @@ int main(int argc, char *argv[])
 
 	for (i = 0; vendor[i].compid != 65535; i++)
 		if (ver.manufacturer == vendor[i].compid) {
-			ba2oui(&bdaddr, oui);
-			comp = ouitocomp(oui);
+			comp = batocomp(&bdaddr);
 
 			ba2str(&bdaddr, addr);
 			printf("New BD address: %s", addr);
diff --git a/tools/hcitool.c b/tools/hcitool.c
index a05e31f..f2e4fa4 100644
--- a/tools/hcitool.c
+++ b/tools/hcitool.c
@@ -581,7 +581,7 @@ static void cmd_scan(int dev_id, int argc, char **argv)
 	uint8_t lap[3] = { 0x33, 0x8b, 0x9e };
 	int num_rsp, length, flags;
 	uint8_t cls[3], features[8];
-	char addr[18], name[249], oui[9], *comp, *tmp;
+	char addr[18], name[249], *comp, *tmp;
 	struct hci_version version;
 	struct hci_dev_info di;
 	struct hci_conn_info_req *cr;
@@ -726,9 +726,10 @@ static void cmd_scan(int dev_id, int argc, char **argv)
 			(info+i)->pscan_rep_mode, btohs((info+i)->clock_offset));
 
 		if (extoui) {
-			ba2oui(&(info+i)->bdaddr, oui);
-			comp = ouitocomp(oui);
+			comp = batocomp(&(info+i)->bdaddr);
 			if (comp) {
+				char oui[9];
+				ba2oui(&(info+i)->bdaddr, oui);
 				printf("OUI company:\t%s (%s)\n", comp, oui);
 				free(comp);
 			}
@@ -898,7 +899,7 @@ static void cmd_info(int dev_id, int argc, char **argv)
 	bdaddr_t bdaddr;
 	uint16_t handle;
 	uint8_t features[8], max_page = 0;
-	char name[249], oui[9], *comp, *tmp;
+	char name[249], *comp, *tmp;
 	struct hci_version version;
 	struct hci_dev_info di;
 	struct hci_conn_info_req *cr;
@@ -963,9 +964,10 @@ static void cmd_info(int dev_id, int argc, char **argv)
 
 	printf("\tBD Address:  %s\n", argv[0]);
 
-	ba2oui(&bdaddr, oui);
-	comp = ouitocomp(oui);
+	comp = batocomp(&bdaddr);
 	if (comp) {
+		char oui[9];
+		ba2oui(&bdaddr, oui);
 		printf("\tOUI Company: %s (%s)\n", comp, oui);
 		free(comp);
 	}