diff --git a/check-needles.py b/check-needles.py
index 74b93cef..b870f0fe 100755
--- a/check-needles.py
+++ b/check-needles.py
@@ -88,7 +88,7 @@ for num in range(1, 10):
 for scheme in ("standard", "lvmthin", "btrfs", "lvm"):
     testliterals.append(f"anaconda_part_scheme_{scheme}")
 # custom_blivet_add_partition
-for dtype in ("lvm", "lvmthin", "raid"):
+for dtype in ("lvmvg", "lvmlv", "lvmthin", "raid"):
     testliterals.append(f"anaconda_blivet_part_devicetype_{dtype}")
 for fsys in ("ext3", "ext4", "xfs", "btrfs", "ppc_prep_boot", "swap", "efi_filesystem"):
     testliterals.append(f"anaconda_blivet_part_fs_{fsys}")
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20200116.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20200116.json
deleted file mode 100644
index 38450bc2..00000000
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20200116.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 205,
-      "width": 42,
-      "type": "match",
-      "height": 26,
-      "xpos": 409
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_devicetype_lvm"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20210208.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20210208.json
deleted file mode 100644
index 1b2c79ad..00000000
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20210208.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "height": 26,
-      "ypos": 145,
-      "xpos": 397,
-      "width": 64,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_devicetype_lvm"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm.json
deleted file mode 100644
index fc4e49aa..00000000
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_devicetype_lvm"
-  ],
-  "area": [
-    {
-      "xpos": 415,
-      "ypos": 149,
-      "width": 84,
-      "height": 18,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-20210608.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-20210608.json
new file mode 100644
index 00000000..fd39bdde
--- /dev/null
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-20210608.json
@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 17,
+            "type": "match",
+            "width": 96,
+            "xpos": 434,
+            "ypos": 148
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "anaconda_blivet_part_devicetype_lvmlv"
+    ]
+}
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-20210608.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-20210608.png
new file mode 100644
index 00000000..142060c3
Binary files /dev/null and b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-20210608.png differ
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-blue-20210208.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-blue-20210208.json
new file mode 100644
index 00000000..b9740f55
--- /dev/null
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-blue-20210208.json
@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 18,
+            "type": "match",
+            "width": 96,
+            "xpos": 434,
+            "ypos": 147
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "anaconda_blivet_part_devicetype_lvmlv"
+    ]
+}
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20210208.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-blue-20210208.png
similarity index 100%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20210208.png
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv-blue-20210208.png
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv.json
new file mode 100644
index 00000000..f624060f
--- /dev/null
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv.json
@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 16,
+            "type": "match",
+            "width": 95,
+            "xpos": 452,
+            "ypos": 149
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "anaconda_blivet_part_devicetype_lvmlv"
+    ]
+}
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv.png
similarity index 100%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm.png
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmlv.png
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmvg-20200116.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmvg-20200116.json
new file mode 100644
index 00000000..a3ee4523
--- /dev/null
+++ b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmvg-20200116.json
@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 17,
+            "type": "match",
+            "width": 87,
+            "xpos": 449,
+            "ypos": 211
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "anaconda_blivet_part_devicetype_lvmvg"
+    ]
+}
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20200116.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmvg-20200116.png
similarity index 100%
rename from needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvm-20200116.png
rename to needles/anaconda/partitioning/blivet/anaconda_blivet_part_devicetype_lvmvg-20200116.png
diff --git a/tests/disk_custom_blivet_lvm_ext4.pm b/tests/disk_custom_blivet_lvm_ext4.pm
index eb739bf3..e16ecc46 100644
--- a/tests/disk_custom_blivet_lvm_ext4.pm
+++ b/tests/disk_custom_blivet_lvm_ext4.pm
@@ -19,12 +19,12 @@ sub run {
     }
 
     custom_blivet_add_partition(size => 512, mountpoint => '/boot', filesystem => 'ext4');
-    # add new LVM device
-    custom_blivet_add_partition(devicetype => 'lvm');
-    # select newly created LVM device for adding new partition
+    # add new LVM VG
+    custom_blivet_add_partition(devicetype => 'lvmvg');
+    # select newly created LVM device for adding new LV
     assert_and_click "anaconda_blivet_volumes_icon";
-    # add lvm partition with ext4 and mount is as /
-    custom_blivet_add_partition(devicetype => 'lvm', filesystem => 'ext4', mountpoint => '/');
+    # add lvm LV with ext4 and mount it as /
+    custom_blivet_add_partition(devicetype => 'lvmlv', filesystem => 'ext4', mountpoint => '/');
 
     assert_and_click "anaconda_spoke_done";
     assert_and_click "anaconda_part_accept_changes";
diff --git a/tests/disk_custom_blivet_lvmthin.pm b/tests/disk_custom_blivet_lvmthin.pm
index d8c6be1f..23b15975 100644
--- a/tests/disk_custom_blivet_lvmthin.pm
+++ b/tests/disk_custom_blivet_lvmthin.pm
@@ -19,9 +19,9 @@ sub run {
     }
 
     custom_blivet_add_partition(size => 512, mountpoint => '/boot');
-    # add new LVM device
-    custom_blivet_add_partition(devicetype => 'lvm');
-    # select newly created LVM device for adding new partition
+    # add new LVM VG
+    custom_blivet_add_partition(devicetype => 'lvmvg');
+    # select newly created LVM device for adding new pool
     assert_and_click "anaconda_blivet_volumes_icon";
     # add lvmthinpool
     custom_blivet_add_partition(devicetype => 'lvmthin');