diff --git a/lib/label/lvm2_label.c b/lib/label/lvm2_label.c
index dbb25b135..fe19e87e2 100644
--- a/lib/label/lvm2_label.c
+++ b/lib/label/lvm2_label.c
@@ -333,7 +333,7 @@ static int _accept_format(struct dev_filter *f, struct device *dev)
 /* We just want to know if it's labelled or not */
 static int _accept_label(struct dev_filter *f, struct device *dev)
 {
-    return is_labelled(dev);
+    return lvm2_is_labelled(NULL, dev);
 }
 
 static void _destroy(struct dev_filter *f)
@@ -555,7 +555,7 @@ static struct labeller this_labeller =
 };
 
 /* Don't know how this gets called... */
-void lvm2_init()
+void lvm2_label_init()
 {
     label_register_handler("LVM2", &this_labeller);
 }
diff --git a/lib/label/lvm2_label.h b/lib/label/lvm2_label.h
index b901a889d..e98118469 100644
--- a/lib/label/lvm2_label.h
+++ b/lib/label/lvm2_label.h
@@ -23,5 +23,5 @@ struct lvm2_label
 #define VERSION_MATCH_LESSEQUAL 3
 #define VERSION_MATCH_ANY       4
 
-extern struct dev_filter *label_filter_create();
-extern struct dev_filter *label_format_filter_create(char *disk_type, uint32_t version[3], int match_type);
+extern struct dev_filter *lvm2_label_filter_create();
+extern struct dev_filter *lvm2_label_format_filter_create(char *disk_type, uint32_t version[3], int match_type);