diff --git a/plugins/hciops.c b/plugins/hciops.c
index 0ebf533..86589ad 100644
--- a/plugins/hciops.c
+++ b/plugins/hciops.c
@@ -2041,7 +2041,8 @@ static inline void extended_inquiry_result(int index, int plen, void *ptr)
 					| (info->dev_class[2] << 16);
 		gboolean cfm_name;
 
-		if (eir_has_complete_name(info->data, sizeof(info->data)))
+		if (eir_has_data_type(info->data, sizeof(info->data),
+							EIR_NAME_COMPLETE))
 			cfm_name = FALSE;
 		else
 			cfm_name = TRUE;
diff --git a/src/eir.c b/src/eir.c
index fcecfca..aba0586 100644
--- a/src/eir.c
+++ b/src/eir.c
@@ -334,7 +334,7 @@ void eir_create(const char *name, int8_t tx_power, uint16_t did_vendor,
 		eir_generate_uuid128(uuids, ptr, &eir_len);
 }
 
-gboolean eir_has_complete_name(uint8_t *data, size_t len)
+gboolean eir_has_data_type(uint8_t *data, size_t len, uint8_t type)
 {
 	uint8_t field_len;
 	size_t parsed;
@@ -350,7 +350,7 @@ gboolean eir_has_complete_name(uint8_t *data, size_t len)
 		if (parsed > len)
 			break;
 
-		if (data[1] == EIR_NAME_COMPLETE)
+		if (data[1] == type)
 			return TRUE;
 
 		data += field_len + 1;
diff --git a/src/eir.h b/src/eir.h
index 36e650d..4e6a05f 100644
--- a/src/eir.h
+++ b/src/eir.h
@@ -54,4 +54,4 @@ void eir_create(const char *name, int8_t tx_power, uint16_t did_vendor,
 			uint16_t did_product, uint16_t did_version,
 			GSList *uuids, uint8_t *data);
 
-gboolean eir_has_complete_name(uint8_t *data, size_t len);
+gboolean eir_has_data_type(uint8_t *data, size_t len, uint8_t type);