diff --git a/src/lib/plugin_apis/swap.api b/src/lib/plugin_apis/swap.api
index 52eaa944..c7e82490 100644
--- a/src/lib/plugin_apis/swap.api
+++ b/src/lib/plugin_apis/swap.api
@@ -30,7 +30,7 @@ typedef enum {
     BD_SWAP_TECH_MODE_ACTIVATE_DEACTIVATE = 1 << 1,
     BD_SWAP_TECH_MODE_QUERY               = 1 << 2,
     BD_SWAP_TECH_MODE_SET_LABEL           = 1 << 3,
-    BD_SWAP_TECH_MODE_SET_UUID            = 1 << 3,
+    BD_SWAP_TECH_MODE_SET_UUID            = 1 << 4,
 } BDSwapTechMode;
 
 /**
diff --git a/src/plugins/nvdimm.c b/src/plugins/nvdimm.c
index 095680be..962d2536 100644
--- a/src/plugins/nvdimm.c
+++ b/src/plugins/nvdimm.c
@@ -556,7 +556,7 @@ BDNVDIMMNamespaceInfo** bd_nvdimm_list_namespaces (const gchar *bus_name, const
             continue;
 
         ndctl_region_foreach (bus, region) {
-            if (region_name && g_strcmp0 (bus_name, ndctl_region_get_devname (region)) != 0)
+            if (region_name && g_strcmp0 (region_name, ndctl_region_get_devname (region)) != 0)
                 continue;
 
             ndctl_namespace_foreach (region, ndns) {
diff --git a/src/plugins/swap.h b/src/plugins/swap.h
index f860c5c7..28352370 100644
--- a/src/plugins/swap.h
+++ b/src/plugins/swap.h
@@ -27,7 +27,7 @@ typedef enum {
     BD_SWAP_TECH_MODE_ACTIVATE_DEACTIVATE = 1 << 1,
     BD_SWAP_TECH_MODE_QUERY               = 1 << 2,
     BD_SWAP_TECH_MODE_SET_LABEL           = 1 << 3,
-    BD_SWAP_TECH_MODE_SET_UUID            = 1 << 3,
+    BD_SWAP_TECH_MODE_SET_UUID            = 1 << 4,
 } BDSwapTechMode;
 
 /*
diff --git a/tests/part_test.py b/tests/part_test.py
index ef99a13f..821e8e7c 100644
--- a/tests/part_test.py
+++ b/tests/part_test.py
@@ -1236,10 +1236,10 @@ def test_set_part_uuid(self):
 
         # we should still get proper data back
         self.assertTrue(ps)
-        self.assertIn(ps.uuid, ("", None))  # no name
+        self.assertIn(ps.uuid, ("", None))  # no uuid
 
         with self.assertRaises(GLib.GError):
-            BlockDev.part_set_part_name (self.loop_devs[0], ps.path, self.test_uuid)
+            BlockDev.part_set_part_uuid (self.loop_devs[0], ps.path, self.test_uuid)
 
 
 class PartSetTypeCase(PartTestCase):