diff --git a/config/language-redirects b/config/language-redirects
index c588df5b984..1df8b69d21f 100644
--- a/config/language-redirects
+++ b/config/language-redirects
@@ -365,7 +365,8 @@ RedirectMatch  301  "^/licenses/by/4[.]0/deed[.]pt[@_]br(?:[.]html)?$"
 RedirectMatch  301  "^/licenses/by/4[.]0/deed[.]es[@_-]es(?:[.]html)?$"                       "/licenses/by/4.0/deed.es"
 RedirectMatch  301  "^/licenses/by/4[.]0/deed[.]en[@_-]us(?:[.]html)?$"                       "/licenses/by/4.0/deed.en"
 RedirectMatch  301  "^/licenses/by/4[.]0/deed[.]en[@_-]gb(?:[.]html)?$"                       "/licenses/by/4.0/deed.en"
-RedirectMatch  301  "^/licenses/by/4[.]0/([^/]+)/(deed|legalcode)(?:[.]html)?$"               "/licenses/by/4.0/$2.$1"
+RedirectMatch  301  "^/licenses/by/4[.]0/([^/]+)/legalcode(?:[.]html)?$"                      "/licenses/by/4.0/legalcode.$1"
+RedirectMatch  301  "^/licenses/by/4[.]0/([^/]+)/(deed|deed[.]html)?$"                        "/licenses/by/4.0/deed.$1"
 RedirectMatch  301  "^/licenses/by/3[.]0/za/legalcode[.]en[@_]gb(?:[.]html)?$"                "/licenses/by/3.0/za/legalcode.en-gb"
 RedirectMatch  301  "^/licenses/by/3[.]0/za/deed[.]zh[@_-]tw(?:[.]html)?$"                    "/licenses/by/3.0/za/deed.zh-hant"
 RedirectMatch  301  "^/licenses/by/3[.]0/za/deed[.]zh[@_-]cn(?:[.]html)?$"                    "/licenses/by/3.0/za/deed.zh-hans"
@@ -1356,7 +1357,8 @@ RedirectMatch  301  "^/licenses/by-sa/4[.]0/deed[.]pt[@_]br(?:[.]html)?$"
 RedirectMatch  301  "^/licenses/by-sa/4[.]0/deed[.]es[@_-]es(?:[.]html)?$"                    "/licenses/by-sa/4.0/deed.es"
 RedirectMatch  301  "^/licenses/by-sa/4[.]0/deed[.]en[@_-]us(?:[.]html)?$"                    "/licenses/by-sa/4.0/deed.en"
 RedirectMatch  301  "^/licenses/by-sa/4[.]0/deed[.]en[@_-]gb(?:[.]html)?$"                    "/licenses/by-sa/4.0/deed.en"
-RedirectMatch  301  "^/licenses/by-sa/4[.]0/([^/]+)/(deed|legalcode)(?:[.]html)?$"            "/licenses/by-sa/4.0/$2.$1"
+RedirectMatch  301  "^/licenses/by-sa/4[.]0/([^/]+)/legalcode(?:[.]html)?$"                   "/licenses/by-sa/4.0/legalcode.$1"
+RedirectMatch  301  "^/licenses/by-sa/4[.]0/([^/]+)/(deed|deed[.]html)?$"                     "/licenses/by-sa/4.0/deed.$1"
 RedirectMatch  301  "^/licenses/by-sa/3[.]0/za/legalcode[.]en[@_]gb(?:[.]html)?$"             "/licenses/by-sa/3.0/za/legalcode.en-gb"
 RedirectMatch  301  "^/licenses/by-sa/3[.]0/za/deed[.]zh[@_-]tw(?:[.]html)?$"                 "/licenses/by-sa/3.0/za/deed.zh-hant"
 RedirectMatch  301  "^/licenses/by-sa/3[.]0/za/deed[.]zh[@_-]cn(?:[.]html)?$"                 "/licenses/by-sa/3.0/za/deed.zh-hans"
@@ -2347,7 +2349,8 @@ RedirectMatch  301  "^/licenses/by-nd/4[.]0/deed[.]pt[@_]br(?:[.]html)?$"
 RedirectMatch  301  "^/licenses/by-nd/4[.]0/deed[.]es[@_-]es(?:[.]html)?$"                    "/licenses/by-nd/4.0/deed.es"
 RedirectMatch  301  "^/licenses/by-nd/4[.]0/deed[.]en[@_-]us(?:[.]html)?$"                    "/licenses/by-nd/4.0/deed.en"
 RedirectMatch  301  "^/licenses/by-nd/4[.]0/deed[.]en[@_-]gb(?:[.]html)?$"                    "/licenses/by-nd/4.0/deed.en"
-RedirectMatch  301  "^/licenses/by-nd/4[.]0/([^/]+)/(deed|legalcode)(?:[.]html)?$"            "/licenses/by-nd/4.0/$2.$1"
+RedirectMatch  301  "^/licenses/by-nd/4[.]0/([^/]+)/legalcode(?:[.]html)?$"                   "/licenses/by-nd/4.0/legalcode.$1"
+RedirectMatch  301  "^/licenses/by-nd/4[.]0/([^/]+)/(deed|deed[.]html)?$"                     "/licenses/by-nd/4.0/deed.$1"
 RedirectMatch  301  "^/licenses/by-nd/3[.]0/za/legalcode[.]en[@_]gb(?:[.]html)?$"             "/licenses/by-nd/3.0/za/legalcode.en-gb"
 RedirectMatch  301  "^/licenses/by-nd/3[.]0/za/deed[.]zh[@_-]tw(?:[.]html)?$"                 "/licenses/by-nd/3.0/za/deed.zh-hant"
 RedirectMatch  301  "^/licenses/by-nd/3[.]0/za/deed[.]zh[@_-]cn(?:[.]html)?$"                 "/licenses/by-nd/3.0/za/deed.zh-hans"
@@ -3376,7 +3379,8 @@ RedirectMatch  301  "^/licenses/by-nc/4[.]0/deed[.]pt[@_]br(?:[.]html)?$"
 RedirectMatch  301  "^/licenses/by-nc/4[.]0/deed[.]es[@_-]es(?:[.]html)?$"                    "/licenses/by-nc/4.0/deed.es"
 RedirectMatch  301  "^/licenses/by-nc/4[.]0/deed[.]en[@_-]us(?:[.]html)?$"                    "/licenses/by-nc/4.0/deed.en"
 RedirectMatch  301  "^/licenses/by-nc/4[.]0/deed[.]en[@_-]gb(?:[.]html)?$"                    "/licenses/by-nc/4.0/deed.en"
-RedirectMatch  301  "^/licenses/by-nc/4[.]0/([^/]+)/(deed|legalcode)(?:[.]html)?$"            "/licenses/by-nc/4.0/$2.$1"
+RedirectMatch  301  "^/licenses/by-nc/4[.]0/([^/]+)/legalcode(?:[.]html)?$"                   "/licenses/by-nc/4.0/legalcode.$1"
+RedirectMatch  301  "^/licenses/by-nc/4[.]0/([^/]+)/(deed|deed[.]html)?$"                     "/licenses/by-nc/4.0/deed.$1"
 RedirectMatch  301  "^/licenses/by-nc/3[.]0/za/legalcode[.]en[@_]gb(?:[.]html)?$"             "/licenses/by-nc/3.0/za/legalcode.en-gb"
 RedirectMatch  301  "^/licenses/by-nc/3[.]0/za/deed[.]zh[@_-]tw(?:[.]html)?$"                 "/licenses/by-nc/3.0/za/deed.zh-hant"
 RedirectMatch  301  "^/licenses/by-nc/3[.]0/za/deed[.]zh[@_-]cn(?:[.]html)?$"                 "/licenses/by-nc/3.0/za/deed.zh-hans"
@@ -4367,7 +4371,8 @@ RedirectMatch  301  "^/licenses/by-nc-sa/4[.]0/deed[.]pt[@_]br(?:[.]html)?$"
 RedirectMatch  301  "^/licenses/by-nc-sa/4[.]0/deed[.]es[@_-]es(?:[.]html)?$"                 "/licenses/by-nc-sa/4.0/deed.es"
 RedirectMatch  301  "^/licenses/by-nc-sa/4[.]0/deed[.]en[@_-]us(?:[.]html)?$"                 "/licenses/by-nc-sa/4.0/deed.en"
 RedirectMatch  301  "^/licenses/by-nc-sa/4[.]0/deed[.]en[@_-]gb(?:[.]html)?$"                 "/licenses/by-nc-sa/4.0/deed.en"
-RedirectMatch  301  "^/licenses/by-nc-sa/4[.]0/([^/]+)/(deed|legalcode)(?:[.]html)?$"         "/licenses/by-nc-sa/4.0/$2.$1"
+RedirectMatch  301  "^/licenses/by-nc-sa/4[.]0/([^/]+)/legalcode(?:[.]html)?$"                "/licenses/by-nc-sa/4.0/legalcode.$1"
+RedirectMatch  301  "^/licenses/by-nc-sa/4[.]0/([^/]+)/(deed|deed[.]html)?$"                  "/licenses/by-nc-sa/4.0/deed.$1"
 RedirectMatch  301  "^/licenses/by-nc-sa/3[.]0/za/legalcode[.]en[@_]gb(?:[.]html)?$"          "/licenses/by-nc-sa/3.0/za/legalcode.en-gb"
 RedirectMatch  301  "^/licenses/by-nc-sa/3[.]0/za/deed[.]zh[@_-]tw(?:[.]html)?$"              "/licenses/by-nc-sa/3.0/za/deed.zh-hant"
 RedirectMatch  301  "^/licenses/by-nc-sa/3[.]0/za/deed[.]zh[@_-]cn(?:[.]html)?$"              "/licenses/by-nc-sa/3.0/za/deed.zh-hans"
@@ -5358,7 +5363,8 @@ RedirectMatch  301  "^/licenses/by-nc-nd/4[.]0/deed[.]pt[@_]br(?:[.]html)?$"
 RedirectMatch  301  "^/licenses/by-nc-nd/4[.]0/deed[.]es[@_-]es(?:[.]html)?$"                 "/licenses/by-nc-nd/4.0/deed.es"
 RedirectMatch  301  "^/licenses/by-nc-nd/4[.]0/deed[.]en[@_-]us(?:[.]html)?$"                 "/licenses/by-nc-nd/4.0/deed.en"
 RedirectMatch  301  "^/licenses/by-nc-nd/4[.]0/deed[.]en[@_-]gb(?:[.]html)?$"                 "/licenses/by-nc-nd/4.0/deed.en"
-RedirectMatch  301  "^/licenses/by-nc-nd/4[.]0/([^/]+)/(deed|legalcode)(?:[.]html)?$"         "/licenses/by-nc-nd/4.0/$2.$1"
+RedirectMatch  301  "^/licenses/by-nc-nd/4[.]0/([^/]+)/legalcode(?:[.]html)?$"                "/licenses/by-nc-nd/4.0/legalcode.$1"
+RedirectMatch  301  "^/licenses/by-nc-nd/4[.]0/([^/]+)/(deed|deed[.]html)?$"                  "/licenses/by-nc-nd/4.0/deed.$1"
 RedirectMatch  301  "^/licenses/by-nc-nd/3[.]0/za/legalcode[.]en[@_]gb(?:[.]html)?$"          "/licenses/by-nc-nd/3.0/za/legalcode.en-gb"
 RedirectMatch  301  "^/licenses/by-nc-nd/3[.]0/za/deed[.]zh[@_-]tw(?:[.]html)?$"              "/licenses/by-nc-nd/3.0/za/deed.zh-hant"
 RedirectMatch  301  "^/licenses/by-nc-nd/3[.]0/za/deed[.]zh[@_-]cn(?:[.]html)?$"              "/licenses/by-nc-nd/3.0/za/deed.zh-hans"