diff --git a/lib/anaconda.pm b/lib/anaconda.pm
index b3bac3b2..46ba41cc 100644
--- a/lib/anaconda.pm
+++ b/lib/anaconda.pm
@@ -185,7 +185,7 @@ sub custom_blivet_format_partition {
     assert_and_click "anaconda_blivet_part_format";
     # Select the appropriate filesystem type.
     assert_and_click "anaconda_blivet_part_drop_select";
-    assert_and_click "anaconda_blivet_part_select_$args{type}";
+    assert_and_click "anaconda_blivet_part_fs_$args{type}";
     wait_still_screen 2;
     # Fill in the label if needed.
     send_key "tab";
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_efi.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_efi.json
deleted file mode 100644
index 1fc43f30..00000000
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_efi.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 517,
-      "ypos": 134,
-      "width": 129,
-      "height": 18,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_select_efi"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_efi.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_efi.png
deleted file mode 100644
index 4bc780fd..00000000
Binary files a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_efi.png and /dev/null differ
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_ext4.json b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_ext4.json
deleted file mode 100644
index a9d7c0cd..00000000
--- a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_ext4.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "properties": [],
-  "tags": [
-    "anaconda_blivet_part_select_ext4"
-  ],
-  "area": [
-    {
-      "xpos": 519,
-      "ypos": 315,
-      "width": 31,
-      "height": 17,
-      "type": "match"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_ext4.png b/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_ext4.png
deleted file mode 100644
index b876b8ce..00000000
Binary files a/needles/anaconda/partitioning/blivet/anaconda_blivet_part_select_ext4.png and /dev/null differ
diff --git a/tests/disk_custom_blivet_resize.pm b/tests/disk_custom_blivet_resize.pm
index e2932756..14904535 100644
--- a/tests/disk_custom_blivet_resize.pm
+++ b/tests/disk_custom_blivet_resize.pm
@@ -36,7 +36,7 @@ sub run {
     # partition first.
     if (get_var("UEFI") == 1) {
         #The efi partition should be already activated. So reformat it and remount.
-        custom_blivet_format_partition(type => 'efi', label => 'efiboot', mountpoint => '/boot/efi');
+        custom_blivet_format_partition(type => 'efi_filesystem', label => 'efiboot', mountpoint => '/boot/efi');
         wait_still_screen 5;
     }