diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index ace6d9642..88340006d 100644
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -691,7 +691,7 @@ static int _dm_task_run_v1(struct dm_task *dmt)
 
 	if ((unsigned) dmt->type >=
 	    (sizeof(_cmd_data_v1) / sizeof(*_cmd_data_v1))) {
-		log_error("Internal error: unknown device-mapper task %d",
+		log_error(INTERNAL ERROR "unknown device-mapper task %d",
 			  dmt->type);
 		goto bad;
 	}
@@ -1814,7 +1814,7 @@ int dm_task_run(struct dm_task *dmt)
 
 	if ((unsigned) dmt->type >=
 	    (sizeof(_cmd_data_v4) / sizeof(*_cmd_data_v4))) {
-		log_error("Internal error: unknown device-mapper task %d",
+		log_error(INTERNAL_ERROR "unknown device-mapper task %d",
 			  dmt->type);
 		return 0;
 	}
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 6df912d1e..fd3a12813 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -1931,7 +1931,7 @@ int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node,
 	struct load_segment *seg;
 
 	if (!node->props.segment_count) {
-		log_error("Internal error: Attempt to add target area to missing segment.");
+		log_error(INTERNAL_ERROR "Attempt to add target area to missing segment.");
 		return 0;
 	}
 
@@ -2030,7 +2030,7 @@ int dm_tree_node_add_target_area(struct dm_tree_node *node,
 	}
 
 	if (!node->props.segment_count) {
-		log_error("Internal error: Attempt to add target area to missing segment.");
+		log_error(INTERNAL_ERROR "Attempt to add target area to missing segment.");
 		return 0;
 	}
 
diff --git a/libdm/mm/dbg_malloc.c b/libdm/mm/dbg_malloc.c
index 36fd74daa..4a2e1cc4e 100644
--- a/libdm/mm/dbg_malloc.c
+++ b/libdm/mm/dbg_malloc.c
@@ -23,7 +23,7 @@ char *dm_strdup_aux(const char *str, const char *file, int line)
 	char *ret;
 
 	if (!str) {
-		log_error("Internal error: dm_strdup called with NULL pointer");
+		log_error(INTERNAL_ERROR "dm_strdup called with NULL pointer");
 		return NULL;
 	}
 
diff --git a/libdm/mm/pool-fast.c b/libdm/mm/pool-fast.c
index d34cd9aa6..c8f3429ee 100644
--- a/libdm/mm/pool-fast.c
+++ b/libdm/mm/pool-fast.c
@@ -132,7 +132,7 @@ void dm_pool_free(struct dm_pool *p, void *ptr)
 	}
 
 	if (!c)
-		log_error("Internal error: pool_free asked to free pointer "
+		log_error(INTERNAL_ERROR "pool_free asked to free pointer "
 			  "not in pool");
 	else
 		p->chunk = c;
diff --git a/libdm/regex/matcher.c b/libdm/regex/matcher.c
index c2dda3e87..d9c2d8ad5 100644
--- a/libdm/regex/matcher.c
+++ b/libdm/regex/matcher.c
@@ -133,7 +133,7 @@ static void _calc_functions(struct dm_regex *m)
 			break;
 
 		default:
-			log_error("Internal error: Unknown calc node type");
+			log_error(INTERNAL_ERROR "Unknown calc node type");
 		}
 
 		/*
diff --git a/liblvm/lvm_lv.c b/liblvm/lvm_lv.c
index 82e6d4b03..d3bb6b881 100644
--- a/liblvm/lvm_lv.c
+++ b/liblvm/lvm_lv.c
@@ -44,7 +44,7 @@ char *lvm_lv_get_uuid(const lv_t lv)
 	char uuid[64] __attribute((aligned(8)));
 
 	if (!id_write_format(&lv->lvid.id[1], uuid, sizeof(uuid))) {
-		log_error("Internal error converting uuid");
+		log_error(INTERNAL_ERROR "unable to convert uuid");
 		return NULL;
 	}
 	return strndup((const char *)uuid, 64);
diff --git a/liblvm/lvm_pv.c b/liblvm/lvm_pv.c
index ac29ea583..894aa4bc2 100644
--- a/liblvm/lvm_pv.c
+++ b/liblvm/lvm_pv.c
@@ -22,7 +22,7 @@ char *lvm_pv_get_uuid(const pv_t pv)
 	char uuid[64] __attribute((aligned(8)));
 
 	if (!id_write_format(&pv->id, uuid, sizeof(uuid))) {
-		log_error("Internal error converting uuid");
+		log_error(INTERNAL_ERROR "Unable to convert uuid");
 		return NULL;
 	}
 	return strndup((const char *)uuid, 64);
diff --git a/liblvm/lvm_vg.c b/liblvm/lvm_vg.c
index 334e90669..4bb4cae14 100644
--- a/liblvm/lvm_vg.c
+++ b/liblvm/lvm_vg.c
@@ -333,7 +333,7 @@ char *lvm_vg_get_uuid(const vg_t vg)
 	char uuid[64] __attribute((aligned(8)));
 
 	if (!id_write_format(&vg->id, uuid, sizeof(uuid))) {
-		log_error("Internal error converting uuid");
+		log_error(INTERNAL_ERROR "Unable to convert uuid");
 		return NULL;
 	}
 	return strndup((const char *)uuid, 64);