diff --git a/README.md b/README.md
index ff00e3ad..f62e6390 100644
--- a/README.md
+++ b/README.md
@@ -143,10 +143,14 @@ Tests can run in different languages. To set the language which will be used for
 variable for the test suite. The results of this will be:
 
 1. The value set will be typed into the language search box in anaconda.
-2. Only needles with the tags `ENV-LANGUAGE-ALL` and `ENV-LANGUAGE-(LANGUAGE)` will be used for the test (where `(LANGUAGE)` is the value set, forced to upper-case).
+2. Any needle with at least one tag that starts with `LANGUAGE` will be unregistered unless it has the tag `LANGUAGE-(LANGUAGE)` (where `(LANGUAGE)` is the value set, forced to upper-case).
 3. As a consequence, the chosen language will be selected at the anaconda Welcome screen.
 
 It is very important, therefore, that needles have the correct tags. Any needle which is expected to match for
-tests run in *any* language must have the `ENV-LANGUAGE-ALL` tag. Other needles must have the appropriate tag(s)
-for the languages they are expected to match. The safest option if you are unsure is to set `ENV-LANGUAGE-ALL`.
+tests run in *any* language must have no `LANGUAGE` tags. Other needles must have the appropriate tag(s)
+for the languages they are expected to match. The safest option if you are unsure is to set no `LANGUAGE` tag(s).
 The only danger of this is that missing translations may not be caught.
+
+Note that tags of the form `ENV-INSTLANG-(anything)` are useless artefacts and should be removed. Due to
+unfortunate design in openQA, any needle created in the web UI needle editor will have a `ENV-INSTLANG-en_US`
+tag by default; this should be removed before submission.
diff --git a/main.pm b/main.pm
index 6f6f0944..61db2e57 100644
--- a/main.pm
+++ b/main.pm
@@ -31,16 +31,37 @@ sub unregister_needle_tags($) {
     for my $n (@a) { $n->unregister(); }
 }
 
-# Un-register all needles *except* those with specified tags (arg is a
-# list of tags)
-sub unregister_except_tags {
+# The purpose of this function is to un-register all needles which have
+# at least one tag that starts with a given string (the 'prefix'), if
+# it does not have any tag that matches the pattern 'prefix-value', for
+# any of the values given in an array. The first argument passed must
+# be the prefix; the second must be a reference to the array of values.
+# For instance, if the 'prefix' is LANGUAGE and the 'values' are
+# ENGLISH and FRENCH, this function would un-reference a needle which
+# had only the tag 'LANGUAGE-DUTCH', but it would keep a needle which
+# had the tag 'LANGUAGE-ENGLISH', or a needle with no tag starting in
+# 'LANGUAGE-' at all.
+sub unregister_prefix_tags {
+    my ($prefix, $valueref) = @_;
     NEEDLE: for my $needle ( needle::all() ) {
-        for my $tag (@_) {
-            # If the needle has any of the tags, we skip to the next needle
-            next NEEDLE if ($needle->has_tag($tag));
+        my $unregister = 0;
+        for my $tag ( @{$needle->{'tags'}} ) {
+            if ($tag =~ /^\Q$prefix/) {
+                # We have at least one tag matching the prefix, so we
+                # *MAY* want to un-register the needle
+                $unregister = 1;
+                for my $value ( @{$valueref} ) {
+                    # At any point if we hit a prefix-value match, we
+                    # know we need to keep this needle and can skip
+                    # to the next
+                    next NEEDLE if ($tag eq "$prefix-$value");
+                }
+            }
         }
-        # We only get here for a needle if we didn't match any of the tags
-        $needle->unregister();
+        # We get here if we hit no prefix-value match, but we only want
+        # to unregister the needle if we hit any prefix match, i.e. if
+        # 'unregister' is 1.
+        $needle->unregister() if ($unregister);
     }
 }
 
@@ -56,11 +77,11 @@ sub cleanup_needles() {
         unregister_needle_tags("INSTALLER-smallhub");
     }
 
-    # Unregister non-language-appropriate needles. Needles which are expected
-    # to match all languages have ENV-LANGUAGE-ALL tag.
-    my $lang = uc(get_var('LANGUAGE')) || 'ENGLISH';
-    $lang = 'ENV-LANGUAGE-'.$lang;
-    unregister_except_tags($lang, 'ENV-LANGUAGE-ALL');
+    # Unregister non-language-appropriate needles. See unregister_except_
+    # tags for details; basically all needles with at least one LANGUAGE-
+    # tag will be unregistered unless they match the current langauge.
+    my $langref = [ get_var('LANGUAGE') || 'english' ];
+    unregister_prefix_tags('LANGUAGE', $langref);
 }
 $needle::cleanuphandler = \&cleanup_needles;
 
diff --git a/needles/anaconda_error.json b/needles/anaconda_error.json
index 45b37ae3..d16528fa 100644
--- a/needles/anaconda_error.json
+++ b/needles/anaconda_error.json
@@ -18,7 +18,6 @@
   "tags": [
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server",
-    "ENV-LANGUAGE-ALL",
     "anaconda_error"
   ],
   "properties": []
diff --git a/needles/anaconda_install_destination_delete_all_btn.json b/needles/anaconda_install_destination_delete_all_btn.json
index 60011eb6..6975f733 100644
--- a/needles/anaconda_install_destination_delete_all_btn.json
+++ b/needles/anaconda_install_destination_delete_all_btn.json
@@ -11,7 +11,7 @@
   "tags": [
     "anaconda_install_destination_delete_all_btn",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_encrypt_data.json b/needles/anaconda_install_destination_encrypt_data.json
index e58803ea..29552afc 100644
--- a/needles/anaconda_install_destination_encrypt_data.json
+++ b/needles/anaconda_install_destination_encrypt_data.json
@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_install_destination_encrypt_data",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_install_destination_encrypt_data_french.json b/needles/anaconda_install_destination_encrypt_data_french.json
index 78a95b89..d9a92030 100644
--- a/needles/anaconda_install_destination_encrypt_data_french.json
+++ b/needles/anaconda_install_destination_encrypt_data_french.json
@@ -11,7 +11,7 @@
     "tags": [
         "anaconda_install_destination_encrypt_data",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_pony.json b/needles/anaconda_install_destination_pony.json
index 5b11f482..8c146e29 100644
--- a/needles/anaconda_install_destination_pony.json
+++ b/needles/anaconda_install_destination_pony.json
@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_install_destination_pony",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_install_destination_pony_selected.json b/needles/anaconda_install_destination_pony_selected.json
index 39030e13..9851ed86 100644
--- a/needles/anaconda_install_destination_pony_selected.json
+++ b/needles/anaconda_install_destination_pony_selected.json
@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_install_destination_pony",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-develop"
   ],
   "area": [
diff --git a/needles/anaconda_install_destination_reclaim_space_btn.json b/needles/anaconda_install_destination_reclaim_space_btn.json
index ff60f496..d79aab68 100644
--- a/needles/anaconda_install_destination_reclaim_space_btn.json
+++ b/needles/anaconda_install_destination_reclaim_space_btn.json
@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_btn",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_install_destination_reclaim_space_delete_btn.json b/needles/anaconda_install_destination_reclaim_space_delete_btn.json
index 0ea8b0ba..e13ba4f1 100644
--- a/needles/anaconda_install_destination_reclaim_space_delete_btn.json
+++ b/needles/anaconda_install_destination_reclaim_space_delete_btn.json
@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_delete_btn",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_install_destination_reclaim_space_first_partition.json b/needles/anaconda_install_destination_reclaim_space_first_partition.json
index 98e52bc7..dafafb4c 100644
--- a/needles/anaconda_install_destination_reclaim_space_first_partition.json
+++ b/needles/anaconda_install_destination_reclaim_space_first_partition.json
@@ -11,7 +11,6 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_first_partition",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }
diff --git a/needles/anaconda_install_destination_reclaim_space_first_partition_ntfs.json b/needles/anaconda_install_destination_reclaim_space_first_partition_ntfs.json
index c4af7340..fbfe971c 100644
--- a/needles/anaconda_install_destination_reclaim_space_first_partition_ntfs.json
+++ b/needles/anaconda_install_destination_reclaim_space_first_partition_ntfs.json
@@ -11,7 +11,6 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_first_partition",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-universal"
   ],
   "properties": []
diff --git a/needles/anaconda_install_destination_reclaim_space_second_partition.json b/needles/anaconda_install_destination_reclaim_space_second_partition.json
index 216a5649..0ffd05e3 100644
--- a/needles/anaconda_install_destination_reclaim_space_second_partition.json
+++ b/needles/anaconda_install_destination_reclaim_space_second_partition.json
@@ -11,7 +11,6 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_second_partition",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }
diff --git a/needles/anaconda_install_destination_reclaim_space_shrink_btn.json b/needles/anaconda_install_destination_reclaim_space_shrink_btn.json
index 90562c55..bfcee001 100644
--- a/needles/anaconda_install_destination_reclaim_space_shrink_btn.json
+++ b/needles/anaconda_install_destination_reclaim_space_shrink_btn.json
@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_install_destination_reclaim_space_shrink_btn",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-develop"
   ],
   "area": [
diff --git a/needles/anaconda_install_destination_reclaim_space_shrink_slider.json b/needles/anaconda_install_destination_reclaim_space_shrink_slider.json
index 3944c328..57bc4a12 100644
--- a/needles/anaconda_install_destination_reclaim_space_shrink_slider.json
+++ b/needles/anaconda_install_destination_reclaim_space_shrink_slider.json
@@ -2,7 +2,6 @@
   "tags": [
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-develop",
-    "ENV-LANGUAGE-ALL",
     "anaconda_install_destination_reclaim_space_shrink_slider"
   ],
   "area": [
diff --git a/needles/anaconda_install_destination_save_passphrase.json b/needles/anaconda_install_destination_save_passphrase.json
index 55933ad6..588cb3ca 100644
--- a/needles/anaconda_install_destination_save_passphrase.json
+++ b/needles/anaconda_install_destination_save_passphrase.json
@@ -11,7 +11,7 @@
   "tags": [
     "anaconda_install_destination_save_passphrase",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_install_destination_save_passphrase_french.json b/needles/anaconda_install_destination_save_passphrase_french.json
index 11358fe6..87d1abff 100644
--- a/needles/anaconda_install_destination_save_passphrase_french.json
+++ b/needles/anaconda_install_destination_save_passphrase_french.json
@@ -11,7 +11,7 @@
     "tags": [
         "anaconda_install_destination_save_passphrase",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_install_destination_select_disk_1.json b/needles/anaconda_install_destination_select_disk_1.json
index 89b19903..99b5b0d9 100644
--- a/needles/anaconda_install_destination_select_disk_1.json
+++ b/needles/anaconda_install_destination_select_disk_1.json
@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_install_destination_select_disk_1",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_install_destination_select_disk_2.json b/needles/anaconda_install_destination_select_disk_2.json
index de21f975..40ba3fe9 100644
--- a/needles/anaconda_install_destination_select_disk_2.json
+++ b/needles/anaconda_install_destination_select_disk_2.json
@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_install_destination_select_disk_2",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_install_done.json b/needles/anaconda_install_done.json
index 1a73d2fd..e70f5ffb 100644
--- a/needles/anaconda_install_done.json
+++ b/needles/anaconda_install_done.json
@@ -19,6 +19,6 @@
         "anaconda_install_done",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
 }
diff --git a/needles/anaconda_install_done_french.json b/needles/anaconda_install_done_french.json
index b9393fb6..872dce38 100644
--- a/needles/anaconda_install_done_french.json
+++ b/needles/anaconda_install_done_french.json
@@ -19,6 +19,6 @@
         "anaconda_install_done",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH"
+        "LANGUAGE-french"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_install_root_password.json b/needles/anaconda_install_root_password.json
index 86d7fa33..da535178 100644
--- a/needles/anaconda_install_root_password.json
+++ b/needles/anaconda_install_root_password.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_install_root_password",
         "ENV-DESKTOP-default",
-        "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL"
+        "ENV-DISTRI-fedora"
     ]
 }
diff --git a/needles/anaconda_install_root_password_screen.json b/needles/anaconda_install_root_password_screen.json
index f5514ceb..faf1d6ea 100644
--- a/needles/anaconda_install_root_password_screen.json
+++ b/needles/anaconda_install_root_password_screen.json
@@ -18,7 +18,7 @@
   "tags": [
     "anaconda_install_root_password_screen",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "properties": []
diff --git a/needles/anaconda_install_root_password_screen_french.json b/needles/anaconda_install_root_password_screen_french.json
index 570db8ed..bfc564b7 100644
--- a/needles/anaconda_install_root_password_screen_french.json
+++ b/needles/anaconda_install_root_password_screen_french.json
@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_install_root_password_screen",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_install_root_password_screen_olddpi.json b/needles/anaconda_install_root_password_screen_olddpi.json
index 57cf33ed..45cb7b77 100644
--- a/needles/anaconda_install_root_password_screen_olddpi.json
+++ b/needles/anaconda_install_root_password_screen_olddpi.json
@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_install_root_password_screen",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_install_source_check_repo_added.json b/needles/anaconda_install_source_check_repo_added.json
index 294b691c..d3e35d06 100644
--- a/needles/anaconda_install_source_check_repo_added.json
+++ b/needles/anaconda_install_source_check_repo_added.json
@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_install_source_check_repo_added",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_install_source_check_repo_added_eurlatgr.json b/needles/anaconda_install_source_check_repo_added_eurlatgr.json
index 294b691c..d3e35d06 100644
--- a/needles/anaconda_install_source_check_repo_added_eurlatgr.json
+++ b/needles/anaconda_install_source_check_repo_added_eurlatgr.json
@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_install_source_check_repo_added",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_install_source_check_repo_added_inst_repo.json b/needles/anaconda_install_source_check_repo_added_inst_repo.json
index 95547030..a2dd8e99 100644
--- a/needles/anaconda_install_source_check_repo_added_inst_repo.json
+++ b/needles/anaconda_install_source_check_repo_added_inst_repo.json
@@ -11,7 +11,6 @@
   "tags": [
     "anaconda_install_source_check_repo_added",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }
diff --git a/needles/anaconda_install_source_http_selected.json b/needles/anaconda_install_source_http_selected.json
index be5aee65..4348fff6 100644
--- a/needles/anaconda_install_source_http_selected.json
+++ b/needles/anaconda_install_source_http_selected.json
@@ -3,7 +3,6 @@
   "tags": [
     "anaconda_install_source_http_selected",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_install_source_https_selected.json b/needles/anaconda_install_source_https_selected.json
index cdd81ddc..716cce41 100644
--- a/needles/anaconda_install_source_https_selected.json
+++ b/needles/anaconda_install_source_https_selected.json
@@ -3,7 +3,6 @@
   "tags": [
     "anaconda_install_source_http_selected",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_install_source_on_the_network.json b/needles/anaconda_install_source_on_the_network.json
index 62960031..27977e62 100644
--- a/needles/anaconda_install_source_on_the_network.json
+++ b/needles/anaconda_install_source_on_the_network.json
@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_install_source_on_the_network",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_install_source_repo_select_mirrorlist.json b/needles/anaconda_install_source_repo_select_mirrorlist.json
index d3ec8ec3..c8155f69 100644
--- a/needles/anaconda_install_source_repo_select_mirrorlist.json
+++ b/needles/anaconda_install_source_repo_select_mirrorlist.json
@@ -11,7 +11,7 @@
   "tags": [
     "anaconda_install_source_repo_select_mirrorlist",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_install_user_created_french.json b/needles/anaconda_install_user_created_french.json
new file mode 100644
index 00000000..e557e39b
--- /dev/null
+++ b/needles/anaconda_install_user_created_french.json
@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 18,
+            "type": "match",
+            "width": 48,
+            "xpos": 787,
+            "ypos": 190
+        }
+    ],
+    "tags": [
+        "anaconda_install_user_created",
+        "LANGUAGE-french"
+    ]
+}
diff --git a/needles/anaconda_install_user_created_french.png b/needles/anaconda_install_user_created_french.png
new file mode 100644
index 00000000..516e1bfb
Binary files /dev/null and b/needles/anaconda_install_user_created_french.png differ
diff --git a/needles/anaconda_install_user_creation.json b/needles/anaconda_install_user_creation.json
index 0d2d59f0..a7385ce0 100644
--- a/needles/anaconda_install_user_creation.json
+++ b/needles/anaconda_install_user_creation.json
@@ -11,7 +11,6 @@
     "tags": [
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "anaconda_install_user_creation"
     ]
 }
diff --git a/needles/anaconda_install_user_creation_make_admin.json b/needles/anaconda_install_user_creation_make_admin.json
index 7002895f..30994ac8 100644
--- a/needles/anaconda_install_user_creation_make_admin.json
+++ b/needles/anaconda_install_user_creation_make_admin.json
@@ -11,7 +11,7 @@
     "tags": [
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "anaconda_install_user_creation_make_admin"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_install_user_creation_make_admin_french.json b/needles/anaconda_install_user_creation_make_admin_french.json
index afc2c554..448d3317 100644
--- a/needles/anaconda_install_user_creation_make_admin_french.json
+++ b/needles/anaconda_install_user_creation_make_admin_french.json
@@ -11,7 +11,7 @@
     "tags": [
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "anaconda_install_user_creation_make_admin"
     ]
 }
diff --git a/needles/anaconda_install_user_creation_screen.json b/needles/anaconda_install_user_creation_screen.json
index b25cb638..67621db6 100644
--- a/needles/anaconda_install_user_creation_screen.json
+++ b/needles/anaconda_install_user_creation_screen.json
@@ -3,7 +3,7 @@
   "tags": [
     "anaconda_install_user_creation_screen",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_install_user_creation_screen_french.json b/needles/anaconda_install_user_creation_screen_french.json
index ef38988b..d68a2afb 100644
--- a/needles/anaconda_install_user_creation_screen_french.json
+++ b/needles/anaconda_install_user_creation_screen_french.json
@@ -19,7 +19,7 @@
     "tags": [
         "anaconda_install_user_creation_screen",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_install_user_creation_screen_olddpi.json b/needles/anaconda_install_user_creation_screen_olddpi.json
index af2faf20..f479d707 100644
--- a/needles/anaconda_install_user_creation_screen_olddpi.json
+++ b/needles/anaconda_install_user_creation_screen_olddpi.json
@@ -19,7 +19,7 @@
     "tags": [
         "anaconda_install_user_creation_screen",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_main_hub_begin_installation.json b/needles/anaconda_main_hub_begin_installation.json
index b5444ad2..3aa3a8b6 100644
--- a/needles/anaconda_main_hub_begin_installation.json
+++ b/needles/anaconda_main_hub_begin_installation.json
@@ -12,6 +12,6 @@
         "anaconda_main_hub_begin_installation",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_main_hub_begin_installation_french.json b/needles/anaconda_main_hub_begin_installation_french.json
index 72b21083..a1a0d060 100644
--- a/needles/anaconda_main_hub_begin_installation_french.json
+++ b/needles/anaconda_main_hub_begin_installation_french.json
@@ -12,6 +12,6 @@
         "anaconda_main_hub_begin_installation",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH"
+        "LANGUAGE-french"
     ]
 }
diff --git a/needles/anaconda_main_hub_install_destination.json b/needles/anaconda_main_hub_install_destination.json
index 8de90943..ca64e1bf 100644
--- a/needles/anaconda_main_hub_install_destination.json
+++ b/needles/anaconda_main_hub_install_destination.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_main_hub_install_destination",
         "ENV-DESKTOP-default",
-        "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL"
+        "ENV-DISTRI-fedora"
     ]
 }
diff --git a/needles/anaconda_main_hub_install_destination_already_done.json b/needles/anaconda_main_hub_install_destination_already_done.json
index ee27e0ef..e574bad1 100644
--- a/needles/anaconda_main_hub_install_destination_already_done.json
+++ b/needles/anaconda_main_hub_install_destination_already_done.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_main_hub_install_destination",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_main_hub_installation_source.json b/needles/anaconda_main_hub_installation_source.json
index 1365b7ec..ba9309cc 100644
--- a/needles/anaconda_main_hub_installation_source.json
+++ b/needles/anaconda_main_hub_installation_source.json
@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_main_hub_installation_source",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_main_hub_live.json b/needles/anaconda_main_hub_live.json
index 32faf6d0..0eebba31 100644
--- a/needles/anaconda_main_hub_live.json
+++ b/needles/anaconda_main_hub_live.json
@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_main_hub",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "INSTALLER-smallhub"
   ],
   "area": [
diff --git a/needles/anaconda_main_hub_nonlive.json b/needles/anaconda_main_hub_nonlive.json
index eeff4c2c..389e912e 100644
--- a/needles/anaconda_main_hub_nonlive.json
+++ b/needles/anaconda_main_hub_nonlive.json
@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_main_hub",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_main_hub_select_packages.json b/needles/anaconda_main_hub_select_packages.json
index 53b8fb5f..7564f823 100644
--- a/needles/anaconda_main_hub_select_packages.json
+++ b/needles/anaconda_main_hub_select_packages.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_main_hub_select_packages",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_manual_partitioning.json b/needles/anaconda_manual_partitioning.json
index e2482d9f..90db8f61 100644
--- a/needles/anaconda_manual_partitioning.json
+++ b/needles/anaconda_manual_partitioning.json
@@ -3,7 +3,7 @@
   "tags": [
     "anaconda_manual_partitioning",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_minimal_highlighted.json b/needles/anaconda_minimal_highlighted.json
index bd168704..77ebf54f 100644
--- a/needles/anaconda_minimal_highlighted.json
+++ b/needles/anaconda_minimal_highlighted.json
@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_minimal_highlighted",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_minimal_highlighted_french.json b/needles/anaconda_minimal_highlighted_french.json
index 8b8dc242..3af21278 100644
--- a/needles/anaconda_minimal_highlighted_french.json
+++ b/needles/anaconda_minimal_highlighted_french.json
@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_minimal_highlighted",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_minimal_selected.json b/needles/anaconda_minimal_selected.json
index 7aaa27d3..244372aa 100644
--- a/needles/anaconda_minimal_selected.json
+++ b/needles/anaconda_minimal_selected.json
@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_minimal_selected",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_minimal_selected_french.json b/needles/anaconda_minimal_selected_french.json
index 31de6cb2..c407987d 100644
--- a/needles/anaconda_minimal_selected_french.json
+++ b/needles/anaconda_minimal_selected_french.json
@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_minimal_selected",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_part_accept_changes.json b/needles/anaconda_part_accept_changes.json
index c8dc0188..f300f9c8 100644
--- a/needles/anaconda_part_accept_changes.json
+++ b/needles/anaconda_part_accept_changes.json
@@ -3,7 +3,7 @@
   "tags": [
     "anaconda_part_accept_changes",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_part_add_mountpoint.json b/needles/anaconda_part_add_mountpoint.json
index 1b5bef7b..1fe6a672 100644
--- a/needles/anaconda_part_add_mountpoint.json
+++ b/needles/anaconda_part_add_mountpoint.json
@@ -12,7 +12,7 @@
   "tags": [
     "anaconda_part_add_mountpoint",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_part_automatic.json b/needles/anaconda_part_automatic.json
index dde7b45a..723c05a9 100644
--- a/needles/anaconda_part_automatic.json
+++ b/needles/anaconda_part_automatic.json
@@ -11,7 +11,7 @@
     "tags": [
     "anaconda_part_automatic",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_delete.json b/needles/anaconda_part_delete.json
index cb937e54..152e7bdd 100644
--- a/needles/anaconda_part_delete.json
+++ b/needles/anaconda_part_delete.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_delete",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-generic_boot"
     ]
 }
diff --git a/needles/anaconda_part_desired_capacity.json b/needles/anaconda_part_desired_capacity.json
index 16ebbb36..a2e5188d 100644
--- a/needles/anaconda_part_desired_capacity.json
+++ b/needles/anaconda_part_desired_capacity.json
@@ -11,7 +11,7 @@
   "tags": [
     "anaconda_part_desired_capacity",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "properties": []
diff --git a/needles/anaconda_part_device_type.json b/needles/anaconda_part_device_type.json
index 55ed235e..6e2b40e4 100644
--- a/needles/anaconda_part_device_type.json
+++ b/needles/anaconda_part_device_type.json
@@ -3,7 +3,7 @@
   "tags": [
     "anaconda_part_device_type",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_part_device_type_raid.json b/needles/anaconda_part_device_type_raid.json
index d31ab6d9..5620b3f4 100644
--- a/needles/anaconda_part_device_type_raid.json
+++ b/needles/anaconda_part_device_type_raid.json
@@ -12,7 +12,6 @@
   "tags": [
     "anaconda_part_device_type_raid",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }
diff --git a/needles/anaconda_part_fs_ext3.json b/needles/anaconda_part_fs_ext3.json
index 41d3562f..31f2a583 100644
--- a/needles/anaconda_part_fs_ext3.json
+++ b/needles/anaconda_part_fs_ext3.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_fs_ext3",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_fs_ext4_preselected.json b/needles/anaconda_part_fs_ext4_preselected.json
index 2afd7e16..3b568fdd 100644
--- a/needles/anaconda_part_fs_ext4_preselected.json
+++ b/needles/anaconda_part_fs_ext4_preselected.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_fs",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_fs_xfs_preselected.json b/needles/anaconda_part_fs_xfs_preselected.json
index 2afd7e16..3b568fdd 100644
--- a/needles/anaconda_part_fs_xfs_preselected.json
+++ b/needles/anaconda_part_fs_xfs_preselected.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_fs",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_list_box_boot.json b/needles/anaconda_part_list_box_boot.json
index 0e988c47..68fc83a3 100644
--- a/needles/anaconda_part_list_box_boot.json
+++ b/needles/anaconda_part_list_box_boot.json
@@ -2,7 +2,6 @@
   "tags": [
     "anaconda_part_list_box_boot",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_part_list_box_button.json b/needles/anaconda_part_list_box_button.json
index 93cf1568..331dd901 100644
--- a/needles/anaconda_part_list_box_button.json
+++ b/needles/anaconda_part_list_box_button.json
@@ -3,7 +3,6 @@
   "tags": [
     "anaconda_part_list_box_button",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_part_list_box_root.json b/needles/anaconda_part_list_box_root.json
index f4a6c39a..a255d5fc 100644
--- a/needles/anaconda_part_list_box_root.json
+++ b/needles/anaconda_part_list_box_root.json
@@ -3,7 +3,6 @@
   "tags": [
     "anaconda_part_list_box_root",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/anaconda_part_list_box_swap.json b/needles/anaconda_part_list_box_swap.json
index 6483ff4c..c355f3d7 100644
--- a/needles/anaconda_part_list_box_swap.json
+++ b/needles/anaconda_part_list_box_swap.json
@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_part_list_box_swap",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_plus_button.json b/needles/anaconda_part_plus_button.json
index 1d37dcf4..cc09a5f0 100644
--- a/needles/anaconda_part_plus_button.json
+++ b/needles/anaconda_part_plus_button.json
@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_part_plus_button",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_scheme.json b/needles/anaconda_part_scheme.json
index b6ab4e2c..e393387a 100644
--- a/needles/anaconda_part_scheme.json
+++ b/needles/anaconda_part_scheme.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_scheme",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_scheme_btrfs.json b/needles/anaconda_part_scheme_btrfs.json
index 1512af42..9e2865be 100644
--- a/needles/anaconda_part_scheme_btrfs.json
+++ b/needles/anaconda_part_scheme_btrfs.json
@@ -11,7 +11,6 @@
     "tags": [
     "anaconda_part_scheme_btrfs",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_scheme_lvm.json b/needles/anaconda_part_scheme_lvm.json
index 2692a51f..9f8c9198 100644
--- a/needles/anaconda_part_scheme_lvm.json
+++ b/needles/anaconda_part_scheme_lvm.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_scheme_lvm",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_scheme_lvmthin.json b/needles/anaconda_part_scheme_lvmthin.json
index 59abf88e..69d19587 100644
--- a/needles/anaconda_part_scheme_lvmthin.json
+++ b/needles/anaconda_part_scheme_lvmthin.json
@@ -11,7 +11,7 @@
     "tags": [
         "anaconda_part_scheme_lvmthin",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_part_scheme_standard.json b/needles/anaconda_part_scheme_standard.json
index 4001256f..b4f07f57 100644
--- a/needles/anaconda_part_scheme_standard.json
+++ b/needles/anaconda_part_scheme_standard.json
@@ -11,7 +11,7 @@
     "tags": [
         "anaconda_part_scheme_standard",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_part_select_root.json b/needles/anaconda_part_select_root.json
index 29644c26..c48a11c5 100644
--- a/needles/anaconda_part_select_root.json
+++ b/needles/anaconda_part_select_root.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_select_root",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_select_root_already_selected.json b/needles/anaconda_part_select_root_already_selected.json
index 29644c26..c48a11c5 100644
--- a/needles/anaconda_part_select_root_already_selected.json
+++ b/needles/anaconda_part_select_root_already_selected.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_part_select_root",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_part_select_swap.json b/needles/anaconda_part_select_swap.json
index b7cd6a12..f5d3ecfb 100644
--- a/needles/anaconda_part_select_swap.json
+++ b/needles/anaconda_part_select_swap.json
@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_part_select_swap",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-generic_boot"
     ]
 }
diff --git a/needles/anaconda_part_update_settings.json b/needles/anaconda_part_update_settings.json
index ebaa195e..50a35c3f 100644
--- a/needles/anaconda_part_update_settings.json
+++ b/needles/anaconda_part_update_settings.json
@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_part_update_settings",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_rawhide_accept_fate.json b/needles/anaconda_rawhide_accept_fate.json
index e0fa4707..9d624ccf 100644
--- a/needles/anaconda_rawhide_accept_fate.json
+++ b/needles/anaconda_rawhide_accept_fate.json
@@ -2,7 +2,7 @@
   "tags": [
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "anaconda_rawhide_accept_fate"
   ],
   "area": [
diff --git a/needles/anaconda_rawhide_accept_fate_french.json b/needles/anaconda_rawhide_accept_fate_french.json
index 1bd6c41a..81968c92 100644
--- a/needles/anaconda_rawhide_accept_fate_french.json
+++ b/needles/anaconda_rawhide_accept_fate_french.json
@@ -11,7 +11,7 @@
     "tags": [
         "ENV-DISTRI-fedora",
         "ENV-FLAVOR-server",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "anaconda_rawhide_accept_fate"
     ]
 }
diff --git a/needles/anaconda_report_btn.json b/needles/anaconda_report_btn.json
index adbb4a35..1f219570 100644
--- a/needles/anaconda_report_btn.json
+++ b/needles/anaconda_report_btn.json
@@ -11,7 +11,6 @@
   "tags": [
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server",
-    "ENV-LANGUAGE-ALL",
     "anaconda_report_btn"
   ],
   "properties": []
diff --git a/needles/anaconda_select_install_lang.json b/needles/anaconda_select_install_lang.json
index d8601f78..9c804c08 100644
--- a/needles/anaconda_select_install_lang.json
+++ b/needles/anaconda_select_install_lang.json
@@ -11,7 +11,6 @@
     "tags": [
         "anaconda_select_install_lang",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_select_install_lang_continue.json b/needles/anaconda_select_install_lang_continue.json
index 9bd6aba9..d63e1fb0 100644
--- a/needles/anaconda_select_install_lang_continue.json
+++ b/needles/anaconda_select_install_lang_continue.json
@@ -12,6 +12,6 @@
         "anaconda_select_install_lang_continue",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_select_install_lang_continue_french.json b/needles/anaconda_select_install_lang_continue_french.json
index f558dfde..8faf8b67 100644
--- a/needles/anaconda_select_install_lang_continue_french.json
+++ b/needles/anaconda_select_install_lang_continue_french.json
@@ -12,6 +12,6 @@
         "anaconda_select_install_lang_continue",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH"
+        "LANGUAGE-french"
     ]
 }
diff --git a/needles/anaconda_select_install_lang_english_filtered.json b/needles/anaconda_select_install_lang_english_filtered.json
index fbce96d1..3d6705e3 100644
--- a/needles/anaconda_select_install_lang_english_filtered.json
+++ b/needles/anaconda_select_install_lang_english_filtered.json
@@ -19,6 +19,6 @@
         "anaconda_select_install_lang_filtered",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda_select_install_lang_english_selected.json b/needles/anaconda_select_install_lang_english_selected.json
index df136434..6d4e5c69 100644
--- a/needles/anaconda_select_install_lang_english_selected.json
+++ b/needles/anaconda_select_install_lang_english_selected.json
@@ -12,7 +12,7 @@
         "anaconda_select_install_lang_selected",
         "anaconda_select_install_lang_filtered",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_select_install_lang_french_filtered.json b/needles/anaconda_select_install_lang_french_filtered.json
index 4c9bcbfd..ebee96e8 100644
--- a/needles/anaconda_select_install_lang_french_filtered.json
+++ b/needles/anaconda_select_install_lang_french_filtered.json
@@ -19,6 +19,6 @@
     "anaconda_select_install_lang_filtered",
     "ENV-DESKTOP-default",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-FRENCH"
+    "LANGUAGE-french"
   ]
 }
diff --git a/needles/anaconda_select_install_lang_french_selected.json b/needles/anaconda_select_install_lang_french_selected.json
index 22b3ccf9..66c7a6cf 100644
--- a/needles/anaconda_select_install_lang_french_selected.json
+++ b/needles/anaconda_select_install_lang_french_selected.json
@@ -12,7 +12,7 @@
         "anaconda_select_install_lang_selected",
         "anaconda_select_install_lang_filtered",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_select_install_lang_input.json b/needles/anaconda_select_install_lang_input.json
index 47aac129..807b5c46 100644
--- a/needles/anaconda_select_install_lang_input.json
+++ b/needles/anaconda_select_install_lang_input.json
@@ -12,7 +12,6 @@
     "tags": [
         "anaconda_select_install_lang_input",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/anaconda_spoke_done.json b/needles/anaconda_spoke_done.json
index 05c470e3..0c739f4c 100644
--- a/needles/anaconda_spoke_done.json
+++ b/needles/anaconda_spoke_done.json
@@ -12,6 +12,6 @@
         "anaconda_spoke_done",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
 }
diff --git a/needles/anaconda_spoke_done_french.json b/needles/anaconda_spoke_done_french.json
index d91a7f88..cd050000 100644
--- a/needles/anaconda_spoke_done_french.json
+++ b/needles/anaconda_spoke_done_french.json
@@ -12,6 +12,6 @@
         "anaconda_spoke_done",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH"
+        "LANGUAGE-french"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_spoke_done_olddpi.json b/needles/anaconda_spoke_done_olddpi.json
index 9a585a0b..ff6fa1bf 100644
--- a/needles/anaconda_spoke_done_olddpi.json
+++ b/needles/anaconda_spoke_done_olddpi.json
@@ -12,6 +12,6 @@
         "anaconda_spoke_done",
         "ENV-DESKTOP-default",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH"
+        "LANGUAGE-english"
     ]
 }
\ No newline at end of file
diff --git a/needles/anaconda_user_creation_password_input.json b/needles/anaconda_user_creation_password_input.json
index 77ff41d4..08753475 100644
--- a/needles/anaconda_user_creation_password_input.json
+++ b/needles/anaconda_user_creation_password_input.json
@@ -2,7 +2,7 @@
   "tags": [
     "anaconda_user_creation_password_input",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-server"
   ],
   "properties": [],
diff --git a/needles/anaconda_user_creation_password_input_french.json b/needles/anaconda_user_creation_password_input_french.json
index 3b9ba953..9ffbfea0 100644
--- a/needles/anaconda_user_creation_password_input_french.json
+++ b/needles/anaconda_user_creation_password_input_french.json
@@ -12,7 +12,7 @@
     "tags": [
         "anaconda_user_creation_password_input",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-FRENCH",
+        "LANGUAGE-french",
         "ENV-FLAVOR-server"
     ]
 }
\ No newline at end of file
diff --git a/needles/boot_enter_passphrase.json b/needles/boot_enter_passphrase.json
index daafc7aa..e5c5de68 100644
--- a/needles/boot_enter_passphrase.json
+++ b/needles/boot_enter_passphrase.json
@@ -2,7 +2,6 @@
   "tags": [
     "boot_enter_passphrase",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/boot_enter_passphrase2.json b/needles/boot_enter_passphrase2.json
index daafc7aa..e5c5de68 100644
--- a/needles/boot_enter_passphrase2.json
+++ b/needles/boot_enter_passphrase2.json
@@ -2,7 +2,6 @@
   "tags": [
     "boot_enter_passphrase",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/bootloader_bios_live.json b/needles/bootloader_bios_live.json
index 2d3f6abd..98302bfd 100644
--- a/needles/bootloader_bios_live.json
+++ b/needles/bootloader_bios_live.json
@@ -11,7 +11,6 @@
   "tags": [
     "bootloader",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }
diff --git a/needles/bootloader_bios_offline.json b/needles/bootloader_bios_offline.json
index 2d3f6abd..98302bfd 100644
--- a/needles/bootloader_bios_offline.json
+++ b/needles/bootloader_bios_offline.json
@@ -11,7 +11,6 @@
   "tags": [
     "bootloader",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }
diff --git a/needles/bootloader_uefi.json b/needles/bootloader_uefi.json
index 359e4115..14a7c1e2 100644
--- a/needles/bootloader_uefi.json
+++ b/needles/bootloader_uefi.json
@@ -4,7 +4,6 @@
     "ENV-DISTRI-fedora",
     "ENV-FLAVOR-server_boot",
     "ENV-FLAVOR-workstation_live",
-    "ENV-LANGUAGE-ALL",
     "ENV-UEFI-1",
     "bootloader_uefi"
   ],
diff --git a/needles/console_command_success.json b/needles/console_command_success.json
index 06f5ab72..2b3ec03a 100644
--- a/needles/console_command_success.json
+++ b/needles/console_command_success.json
@@ -2,7 +2,6 @@
   "tags": [
     "console_command_success",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/console_command_success2.json b/needles/console_command_success2.json
index 283fd783..8eba1d87 100644
--- a/needles/console_command_success2.json
+++ b/needles/console_command_success2.json
@@ -2,7 +2,6 @@
   "tags": [
     "console_command_success",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/console_password_required.json b/needles/console_password_required.json
index b0b62d98..914f99bf 100644
--- a/needles/console_password_required.json
+++ b/needles/console_password_required.json
@@ -11,7 +11,6 @@
   "tags": [
     "console_password_required",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }
diff --git a/needles/console_password_required2.json b/needles/console_password_required2.json
index 16c0050e..40dc63ff 100644
--- a/needles/console_password_required2.json
+++ b/needles/console_password_required2.json
@@ -12,7 +12,6 @@
   "tags": [
     "console_password_required",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }
diff --git a/needles/console_raid_used.json b/needles/console_raid_used.json
index 30970697..035fdb8b 100644
--- a/needles/console_raid_used.json
+++ b/needles/console_raid_used.json
@@ -12,7 +12,6 @@
   "tags": [
     "console_raid_used",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ]
 }
diff --git a/needles/console_two_disks_mounted_lvm.json b/needles/console_two_disks_mounted_lvm.json
index d68e2e43..d6346bfb 100644
--- a/needles/console_two_disks_mounted_lvm.json
+++ b/needles/console_two_disks_mounted_lvm.json
@@ -18,7 +18,6 @@
   "tags": [
     "console_two_disks_mounted_lvm",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "properties": []
diff --git a/needles/gnome_desktop_clean.json b/needles/gnome_desktop_clean.json
index 5fa4ab73..db62cb95 100644
--- a/needles/gnome_desktop_clean.json
+++ b/needles/gnome_desktop_clean.json
@@ -2,7 +2,7 @@
   "tags": [
     "ENV-DESKTOP-gnome",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "graphical_desktop_clean"
   ],
   "area": [
diff --git a/needles/gnome_desktop_runner.json b/needles/gnome_desktop_runner.json
index 90d41df8..512958e1 100644
--- a/needles/gnome_desktop_runner.json
+++ b/needles/gnome_desktop_runner.json
@@ -12,7 +12,6 @@
   "tags": [
     "ENV-DESKTOP-gnome",
     "ENV-FLAVOR-workstation_live",
-    "ENV-LANGUAGE-ALL",
     "desktop_runner"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/graphical_login_gdm.json b/needles/graphical_login_gdm.json
index 4eb92d6c..b63376ad 100644
--- a/needles/graphical_login_gdm.json
+++ b/needles/graphical_login_gdm.json
@@ -2,7 +2,7 @@
   "tags": [
     "graphical_login",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-develop"
   ],
   "properties": [],
diff --git a/needles/graphical_login_gdm_input.json b/needles/graphical_login_gdm_input.json
index 35b71fcd..4060f2d2 100644
--- a/needles/graphical_login_gdm_input.json
+++ b/needles/graphical_login_gdm_input.json
@@ -12,7 +12,7 @@
     "tags": [
         "graphical_login_input",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ENGLISH",
+        "LANGUAGE-english",
         "ENV-FLAVOR-develop"
     ]
 }
\ No newline at end of file
diff --git a/needles/graphical_login_sddm.json b/needles/graphical_login_sddm.json
index d6d133de..34fb8c14 100644
--- a/needles/graphical_login_sddm.json
+++ b/needles/graphical_login_sddm.json
@@ -2,7 +2,7 @@
   "tags": [
     "graphical_login",
     "ENV-DESKTOP-kde",
-    "ENV-LANGUAGE-ENGLISH",
+    "LANGUAGE-english",
     "ENV-FLAVOR-kde_live"
   ],
   "properties": [],
diff --git a/needles/kde_desktop_runner.json b/needles/kde_desktop_runner.json
index 65c3cdc9..3dc829ea 100644
--- a/needles/kde_desktop_runner.json
+++ b/needles/kde_desktop_runner.json
@@ -11,7 +11,6 @@
   "tags": [
     "desktop_runner",
     "ENV-DESKTOP-kde",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-kde_live"
   ],
   "properties": []
diff --git a/needles/kde_live_anaconda_icon.json b/needles/kde_live_anaconda_icon.json
index 97885ee2..216ed40a 100644
--- a/needles/kde_live_anaconda_icon.json
+++ b/needles/kde_live_anaconda_icon.json
@@ -3,7 +3,6 @@
     "live_start_anaconda_icon",
     "ENV-DESKTOP-kde",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-kde_live"
   ],
   "area": [
diff --git a/needles/provided_disk_intact.json b/needles/provided_disk_intact.json
index 811dfe56..88319d01 100644
--- a/needles/provided_disk_intact.json
+++ b/needles/provided_disk_intact.json
@@ -2,7 +2,6 @@
   "tags": [
     "provided_disk_intact",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/provided_second_partition_intact.json b/needles/provided_second_partition_intact.json
index 6a9e9976..cc4fd8ac 100644
--- a/needles/provided_second_partition_intact.json
+++ b/needles/provided_second_partition_intact.json
@@ -2,7 +2,6 @@
   "tags": [
     "provided_second_partition_intact",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-server"
   ],
   "area": [
diff --git a/needles/root_logged_in.json b/needles/root_logged_in.json
index 03e39b8a..5dc3a5b1 100644
--- a/needles/root_logged_in.json
+++ b/needles/root_logged_in.json
@@ -20,7 +20,6 @@
         "root_logged_in",
         "root_console",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/root_logged_in_biosfont.json b/needles/root_logged_in_biosfont.json
index f5a97527..adfc50d4 100644
--- a/needles/root_logged_in_biosfont.json
+++ b/needles/root_logged_in_biosfont.json
@@ -19,7 +19,6 @@
         "root_logged_in",
         "root_console",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/text_console_login.json b/needles/text_console_login.json
index a20f8340..a9a351fc 100644
--- a/needles/text_console_login.json
+++ b/needles/text_console_login.json
@@ -2,7 +2,6 @@
   "tags": [
     "text_console_login",
     "ENV-DISTRI-fedora",
-    "ENV-LANGUAGE-ALL",
     "ENV-FLAVOR-develop"
   ],
   "properties": [],
diff --git a/needles/user_logged_in.json b/needles/user_logged_in.json
index c564c19e..4c168fd3 100644
--- a/needles/user_logged_in.json
+++ b/needles/user_logged_in.json
@@ -19,7 +19,6 @@
         "user_logged_in",
         "user_console",
         "ENV-DISTRI-fedora",
-        "ENV-LANGUAGE-ALL",
         "ENV-FLAVOR-server"
     ]
 }
diff --git a/needles/workstation_live_initial.json b/needles/workstation_live_initial.json
index 4ee46031..7c14908c 100644
--- a/needles/workstation_live_initial.json
+++ b/needles/workstation_live_initial.json
@@ -3,8 +3,7 @@
     "live_initial_anaconda_launcher",
     "live_start_anaconda_icon",
     "ENV-DISTRI-fedora",
-    "ENV-DESKTOP-gnome",
-    "ENV-LANGUAGE-ALL"
+    "ENV-DESKTOP-gnome"
   ],
   "area": [
     {
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index 0fd119e0..5a65da2f 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -36,6 +36,11 @@ sub run {
     assert_and_click "anaconda_install_user_creation_make_admin";
     assert_and_click "anaconda_spoke_done";
 
+    # Check username (and hence keyboard layout) if non-English
+    if (get_var('LANGUAGE')) {
+        assert_screen "anaconda_install_user_created";
+    }
+
     # Wait for install to end
     assert_and_click "anaconda_install_done", '', 1800;
     if (get_var('LIVE')) {