@@ -587,6 +587,21 @@ sub setupBasisTranslation {
   $NameToBasis{"def2-tzvpp"} = "def2TZVPP";                  # nbf 59
   $NameToBasis{"def2-qzvp"} = "def2QZVP";                    # nbf 117
 
+  #  Added for #118 from tests/basisload/named_basis_check.py: same function
+  #  count and an RHF energy within 1e-5 Eh of ECCE's own primitives on
+  #  water, under Gaussian 16 (5D 7F).  6-31G(3df,3pd) was removed from
+  #  this table: Gaussian's set differs from ECCE's by 3.4e-3 Eh, so
+  #  naming it silently changed the basis.  Gaussian rejects cc-pVDZ-DK,
+  #  cc-pCV*/cc-pwCV*, d-aug-cc-p*, pc-*/pcseg-*, IGLO-* and cc-pV(X+d)Z.
+
+  $NameToBasis{"6-31++g*"} = "6-31++G*";
+  $NameToBasis{"ahlrichs tzv"} = "TZV";
+  $NameToBasis{"ahlrichs vdz"} = "SV";
+  $NameToBasis{"ahlrichs pvdz"} = "SVP";
+  $NameToBasis{"dzp (dunning)"} = "D95**";
+  $NameToBasis{"sto-6g"} = "STO-6G";
+  $NameToBasis{"ugbs"} = "UGBS";
+
   $NameToBasis{"sto-2g"} = "sto-2g";
   $NameToBasis{"sto-3g"} = "sto-3g";
   $NameToBasis{"sto-3g*"} = "sto-3g*";
@@ -601,7 +616,6 @@ sub setupBasisTranslation {
   $NameToBasis{"6-31g"} = "6-31g";
   $NameToBasis{"6-31++g"} = "6-31++g";
   $NameToBasis{"6-31++g**"} = "6-31++g**";
-  $NameToBasis{"6-31g(3df,3pd)"} = "6-31G(3df,3pd)";
   $NameToBasis{"6-311g"} = "6-311G";
   $NameToBasis{"6-311++g"} = "6-311++G";
   $NameToBasis{"6-311++g(3df,3pd)"} = "6-311++G(3df,3pd)";
 
@@ -5,6 +5,7 @@ optionally an `ECP` block.
 
 * `water_same.gbs`    every atom on one mappable basis -- the route-card case
 * `water_mixed.gbs`   O on 6-31G* (mappable), H on IGLO-II (not) -- per-element
+* `water_gencontr.gbs` / `water_mixed_orca.gbs`  general contraction (cc-pVDZ-style s); H on 6-31++G, which ORCA rejects (IGLO-II is now mappable in ORCA).
 * `water_numonly.gbs` no `NameBasis` section at all -- everything explicit
 * `water_aug_ccpvdz.gbs`, `water_aug_pwcvdz.gbs`  one shared name each, to
   exercise NWChem's name blocklist (named vs. forced explicit)
 
@@ -0,0 +1,25 @@
+NameBasis
+basis "ao basis" cartesian print
+O library "6-31G*"
+H library "6-31++G"
+END
+EndNameBasis
+
+
+NumericalBasis
+basis "ao basis" cartesian print
+O S
+   5484.6717000              0.0018311
+    825.2349500              0.0139501
+    188.0469600              0.0684451
+O SP
+     15.5396160             -0.1107775              0.0708743
+      3.5999336             -0.1480263              0.3397528
+O SP
+      0.2700058              1.0000000              1.0000000
+H S
+     18.7311370              0.0334946
+      2.8253937              0.2347270
+      0.6401217              0.8137573
+END
+EndNumericalBasis
@@ -78,7 +78,7 @@
     ),
     dict(
         name="orca-mixed-per-element",
-        fixture="water_mixed.gbs",
+        fixture="water_mixed_orca.gbs",
         exporter="std2ORCA",
         expect=[("no route card", lambda t: "useRouteCard" not in t),
                 ("O named via NewGTO",
@@ -95,6 +95,18 @@
                 ("Pt explicit", lambda t: "2.63000000" in t),
                 ("ECP still written", lambda t: "PT-ECP" in t)],
     ),
+    dict(
+        name="orca-general-contraction",
+        fixture="water_gencontr.gbs",
+        exporter="std2ORCA",
+        #  cc-pVDZ oxygen s is 8 primitives and TWO contractions.  The ORCA
+        #  writer once wrote only the first, so water had 23 functions
+        #  instead of 24 and the energy was 0.3 Eh off.
+        expect=[("both contractions of the 8-primitive s shell are written",
+                 lambda t: t.count(" S 8") == 2),
+                ("the second column's coefficients are there",
+                 lambda t: "-0.00016000" in t and "0.55736800" in t)],
+    ),
     dict(
         name="orca-ecp-per-element",
         fixture="pth_ecp.gbs",
@@ -355,6 +367,59 @@ def orca_ecp_rows_shape_ok(text):
     return True
 
 
+def name_tables():
+    """%NameToBasis in the ORCA and Gaussian 16 writers.
+
+    Every entry was run against the real code (tests/basisload/
+    named_basis_check.py) and judged by energy against ECCE's own
+    primitives.  This pins a representative set -- a name that silently
+    maps to a different basis, or a verified name that goes missing --
+    without needing either code.  ECCE name -> keyword, exactly.
+    """
+    def table(path):
+        text = open(os.path.join(PARSERS, path)).read()
+        return dict(re.findall(r'\$NameToBasis\{"([^"]+)"\}\s*=\s*"([^"]+)"',
+                               text))
+
+    must = {
+        "wrORCAGBS.pm": {
+            "6-31g*": "6-31G*", "cc-pvdz": "cc-pVDZ",
+            "aug-cc-pvtz": "aug-cc-pVTZ", "cc-pvtz-dk": "cc-pVTZ-DK",
+            "cc-pwcvtz": "cc-pwCVTZ", "aug-cc-pcvdz": "aug-cc-pCVDZ",
+            "pc-2": "pc-2", "pcseg-2": "pcseg-2", "iglo-ii": "IGLO-II",
+            "def2-svp(p)": "def2-SV(P)", "ahlrichs vdz": "SV",
+            "3-21gsp": "3-21GSP", "def2-tzvp": "def2-TZVP"},
+        "wrGaussian16GBS.pm": {
+            "6-31g*": "6-31G*", "6-31++g*": "6-31++G*",
+            "cc-pvdz": "cc-pvdz", "def2-svp": "def2SVP",
+            "def2-svp(p)": "def2SVPP", "midi!": "midix",
+            "dz (dunning)": "d95", "ahlrichs vdz": "SV",
+            "dzp (dunning)": "D95**", "sto-6g": "STO-6G"},
+    }
+    #  Rejected by the code or a different basis from ECCE's under the
+    #  same name: naming any of these must stay impossible.
+    never = {
+        "wrORCAGBS.pm": ["pcseg-0", "3-21g*", "4-31g", "6-31++g",
+                         "6-31++g*", "d-aug-cc-pvdz", "cc-pv(d+d)z",
+                         "dz (dunning)"],
+        "wrGaussian16GBS.pm": ["6-31g(3df,3pd)", "cc-pvdz-dk", "cc-pcvdz",
+                               "d-aug-cc-pvdz", "pc-2", "iglo-ii"],
+    }
+    problems = []
+    for path in must:
+        got = table(path)
+        for name, kw in must[path].items():
+            if got.get(name) != kw:
+                problems.append("%s: %r should map to %r, maps to %r"
+                                % (path, name, kw, got.get(name)))
+        for name in never[path]:
+            if name in got:
+                problems.append("%s: %r is in the table but the code "
+                                "rejects it or its set differs from ECCE's"
+                                % (path, name))
+    return problems
+
+
 def run(case):
     path = os.path.join(PARSERS, case["exporter"])
     with open(os.path.join(FIXTURES, case["fixture"])) as handle:
@@ -422,6 +487,10 @@ def main():
     for finding in mo_ordering_matches_the_code():
         failures.append("MO ordering: " + finding)
 
+    checks += 1
+    for finding in name_tables():
+        failures.append("name tables: " + finding)
+
     checks += 1
     for finding in basis_name_rules(args.verbose):
         failures.append("basis name rules: " + finding)
 
@@ -38,6 +38,7 @@
  * --dump and --complete are described where they are defined.
  */
 #include <string.h>
+#include <stdlib.h>
 #include <iostream>
 #include <strstream>
 #include <string>
@@ -212,7 +213,11 @@ static int dumpOne(int argc, char** argv)
   TGBSGroup* group = new TGBSGroup();
   group->insertOrbitalGBS(argv[3], list, true);
   config.insertGBSGroup(argv[5], group);
-  const char* text = config.dump("NWChem", string(argv[6]) == "named");
+  //  LOADBASIS_CODE picks the code whose GBSExport script formats the
+  //  text (default NWChem), so a deck can be built for ORCA or Gaussian.
+  const char* codeName = getenv("LOADBASIS_CODE");
+  const char* text = config.dump(codeName ? codeName : "NWChem",
+                                 string(argv[6]) == "named");
   cout << text << endl;
   delete [] text;
   return 0;