3 files changed, 12 insertions, 9 deletions
diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm
index 2ad420f657c..75fc38c6605 100644
--- a/Master/tlpkg/TeXLive/TLPOBJ.pm
+++ b/Master/tlpkg/TeXLive/TLPOBJ.pm
@@ -1108,7 +1108,8 @@ sub _parse_hyphen_execute {
       }
       my @foo = &$coderef ($r{"name"}, $r{"lefthyphenmin"},
                            $r{"righthyphenmin"}, $r{"file"}, $r{"synonyms"},
-                           $r{"txtpatt"}, $r{"txthyph"}, $r{"luaspecial"});
+                           $r{"file_patterns"}, $r{"file_exceptions"},
+                           $r{"luaspecial"});
       push @langlines, @foo;
     }
   }
diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm
index d3b870c490d..327db379b47 100644
--- a/Master/tlpkg/TeXLive/TLPSRC.pm
+++ b/Master/tlpkg/TeXLive/TLPSRC.pm
@@ -795,11 +795,13 @@ C<lefthyphenmin>, C<righthyphenmin> (both integers), C<synonyms> (a
 comma-separated list of alias names for that hyphenation), C<databases>
 (a comma-separated list of databases the entry should go in; currently
 recognized are: C<dat> (C<language.dat>), C<def> (C<language.def>) and
-C<lua> (C<language.dat.lua>)), C<txtpatt> and C<txthyph> (files with the
-patterns (resp. exceptions) in plain txt), and C<luaspecial> (string).
+C<lua> (C<language.dat.lua>)), C<file_patterns> and C<file_exceptions>
+(files with the patterns (resp. exceptions) in plain txt), and
+C<luaspecial> (string).
 
 The variable C<databases> defaults to C<dat,def>, or C<dat,def,lua> if
-one of the keys C<txtpatt>, C<txthyph> or C<luaspecial> is used.
+one of the keys C<file_patterns>, C<file_exceptions> or C<luaspecial> is
+used.
 
 =item C<execute AddFormat name=I<fmt> engine=I<eng> [I<var>...]>
 
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 812f00ee7ce..89fbceba39b 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2585,12 +2585,12 @@ sub parse_AddHyphen_line {
       $ret{"file"} = $b;
       next;
     }
-    if ($a eq "txtpatt") {
-        $ret{"txtpatt"} = $b;
+    if ($a eq "file_patterns") {
+        $ret{"file_patterns"} = $b;
         next;
     }
-    if ($a eq "txthyph") {
-        $ret{"txthyph"} = $b;
+    if ($a eq "file_exceptions") {
+        $ret{"file_exceptions"} = $b;
         next;
     }
     if ($a eq "luaspecial") {
@@ -2611,7 +2611,7 @@ sub parse_AddHyphen_line {
   }
   # this default value couldn't be set earlier
   if (not defined($ret{"databases"})) {
-    if (defined $ret{"txtpatt"} or defined $ret{"txthyph"}
+    if (defined $ret{"file_patterns"} or defined $ret{"file_exceptions"}
         or defined $ret{"luaspecial"}) {
       @{$ret{"databases"}} = qw(dat def lua);
     } else {