diff --git a/components/src/output/chtml/fonts/tex/copy.json b/components/src/output/chtml/fonts/tex/copy.json
index d31b2ccc6..c7d89efc7 100644
--- a/components/src/output/chtml/fonts/tex/copy.json
+++ b/components/src/output/chtml/fonts/tex/copy.json
@@ -3,8 +3,8 @@
     "from": "../../../../../../mathjax3-ts/output/chtml/fonts/tex-woff-v2",
     "copy": [
         "MathJax_AMS-Regular.woff",
-        "MathJax_Caligraphic-Bold.woff",
-        "MathJax_Caligraphic-Regular.woff",
+        "MathJax_Calligraphic-Bold.woff",
+        "MathJax_Calligraphic-Regular.woff",
         "MathJax_Fraktur-Bold.woff",
         "MathJax_Fraktur-Regular.woff",
         "MathJax_Main-Bold.woff",
diff --git a/mathjax3-ts/input/tex/TexConstants.ts b/mathjax3-ts/input/tex/TexConstants.ts
index b64ac80ea..16738932c 100644
--- a/mathjax3-ts/input/tex/TexConstants.ts
+++ b/mathjax3-ts/input/tex/TexConstants.ts
@@ -44,7 +44,7 @@ export namespace TexConstant {
     TAILED: 'tailed',
     LOOPED: 'looped',
     STRETCHED: 'stretched',
-    CALIGRAPHIC: '-tex-caligraphic',
+    CALLIGRAPHIC: '-tex-calligraphic',
     OLDSTYLE: '-tex-oldstyle'
   };
 
diff --git a/mathjax3-ts/input/tex/base/BaseMappings.ts b/mathjax3-ts/input/tex/base/BaseMappings.ts
index 1f0ee9176..2c0315616 100644
--- a/mathjax3-ts/input/tex/base/BaseMappings.ts
+++ b/mathjax3-ts/input/tex/base/BaseMappings.ts
@@ -398,7 +398,7 @@ new sm.CommandMap('macros', {
   rm:                ['SetFont', TexConstant.Variant.NORMAL],
   mit:               ['SetFont', TexConstant.Variant.ITALIC],
   oldstyle:          ['SetFont', TexConstant.Variant.OLDSTYLE],
-  cal:               ['SetFont', TexConstant.Variant.CALIGRAPHIC],
+  cal:               ['SetFont', TexConstant.Variant.CALLIGRAPHIC],
   it:                ['SetFont', '-tex-mathit'], // needs special handling
   bf:                ['SetFont', TexConstant.Variant.BOLD],
   bbFont:            ['SetFont', TexConstant.Variant.DOUBLESTRUCK],
diff --git a/mathjax3-ts/input/tex/boldsymbol/BoldsymbolConfiguration.ts b/mathjax3-ts/input/tex/boldsymbol/BoldsymbolConfiguration.ts
index c28d67693..9c1dd6201 100644
--- a/mathjax3-ts/input/tex/boldsymbol/BoldsymbolConfiguration.ts
+++ b/mathjax3-ts/input/tex/boldsymbol/BoldsymbolConfiguration.ts
@@ -39,8 +39,8 @@ BOLDVARIANT[TexConstant.Variant.ITALIC]    = TexConstant.Variant.BOLDITALIC;
 BOLDVARIANT[TexConstant.Variant.FRAKTUR]   = TexConstant.Variant.BOLDFRAKTUR;
 BOLDVARIANT[TexConstant.Variant.SCRIPT]    = TexConstant.Variant.BOLDSCRIPT;
 BOLDVARIANT[TexConstant.Variant.SANSSERIF] = TexConstant.Variant.BOLDSANSSERIF;
-BOLDVARIANT['-tex-caligraphic']    = '-tex-caligraphic-bold';
-BOLDVARIANT['-tex-oldstyle']       = '-tex-oldstyle-bold';
+BOLDVARIANT['-tex-calligraphic']   = '-tex-bold-calligraphic';
+BOLDVARIANT['-tex-oldstyle']       = '-tex-bold-oldstyle';
 
 
 // Namespace
diff --git a/mathjax3-ts/input/tex/physics/PhysicsMappings.ts b/mathjax3-ts/input/tex/physics/PhysicsMappings.ts
index 1a733d86f..e8efecd76 100644
--- a/mathjax3-ts/input/tex/physics/PhysicsMappings.ts
+++ b/mathjax3-ts/input/tex/physics/PhysicsMappings.ts
@@ -18,7 +18,7 @@
 
 /**
  * @fileoverview Mappings for TeX parsing of the physics package.
- *                                            
+ *
  * @author v.sorge@mathjax.org (Volker Sorge)
  */
 
@@ -45,7 +45,7 @@ new CommandMap('Physics-automatic-bracing-macros', {
   'evaluated':      'Eval',
   'eval':           'Eval',
   'order':          ['Quantity', '(', ')', true, 'O',
-                     TexConstant.Variant.CALIGRAPHIC],
+                     TexConstant.Variant.CALLIGRAPHIC],
   'commutator':     'Commutator',
   'comm':           'Commutator',
   'anticommutator': ['Commutator', '\\{', '\\}'],
diff --git a/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Caligraphic-Bold.woff b/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Caligraphic-Bold.woff
deleted file mode 100644
index ad70a1d9f..000000000
Binary files a/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Caligraphic-Bold.woff and /dev/null differ
diff --git a/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Caligraphic-Regular.woff b/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Caligraphic-Regular.woff
deleted file mode 100644
index 8c39739c6..000000000
Binary files a/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Caligraphic-Regular.woff and /dev/null differ
diff --git a/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Calligraphic-Bold.woff b/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Calligraphic-Bold.woff
new file mode 100644
index 000000000..57819c515
Binary files /dev/null and b/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Calligraphic-Bold.woff differ
diff --git a/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Calligraphic-Regular.woff b/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Calligraphic-Regular.woff
new file mode 100644
index 000000000..eb66c4617
Binary files /dev/null and b/mathjax3-ts/output/chtml/fonts/tex-woff-v2/MathJax_Calligraphic-Regular.woff differ
diff --git a/mathjax3-ts/output/chtml/fonts/tex.ts b/mathjax3-ts/output/chtml/fonts/tex.ts
index 7b371d637..81de1210f 100644
--- a/mathjax3-ts/output/chtml/fonts/tex.ts
+++ b/mathjax3-ts/output/chtml/fonts/tex.ts
@@ -42,8 +42,8 @@ import {sansSerif} from './tex/sans-serif.js';
 import {scriptBold} from './tex/script-bold.js';
 import {script} from './tex/script.js';
 import {smallop} from './tex/smallop.js';
-import {texCaligraphicBold} from './tex/tex-caligraphic-bold.js';
-import {texCaligraphic} from './tex/tex-caligraphic.js';
+import {texCalligraphicBold} from './tex/tex-calligraphic-bold.js';
+import {texCalligraphic} from './tex/tex-calligraphic.js';
 import {texMathit} from './tex/tex-mathit.js';
 import {texOldstyleBold} from './tex/tex-oldstyle-bold.js';
 import {texOldstyle} from './tex/tex-oldstyle.js';
@@ -82,8 +82,8 @@ CommonTeXFontMixin<CHTMLCharOptions, CHTMLVariantData, CHTMLDelimiterData, CHTML
         '-largeop': 'mjx-lop',
         '-size3': 'mjx-s3',
         '-size4': 'mjx-s4',
-        '-tex-caligraphic': 'mjx-cal',
-        '-tex-bold-caligraphic': 'mjx-cal mjx-b',
+        '-tex-calligraphic': 'mjx-cal',
+        '-tex-bold-calligraphic': 'mjx-cal mjx-b',
         '-tex-mathit': 'mjx-mit',
         '-tex-oldstyle': 'mjx-os',
         '-tex-bold-oldstyle': 'mjx-os mjx-b',
@@ -117,8 +117,8 @@ CommonTeXFontMixin<CHTMLCharOptions, CHTMLVariantData, CHTMLDelimiterData, CHTML
         '-largeop': largeop,
         '-size3': texSize3,
         '-size4': texSize4,
-        '-tex-caligraphic': texCaligraphic,
-        '-tex-bold-caligraphic': texCaligraphicBold,
+        '-tex-calligraphic': texCalligraphic,
+        '-tex-bold-calligraphic': texCalligraphicBold,
         '-tex-mathit': texMathit,
         '-tex-oldstyle': texOldstyle,
         '-tex-bold-oldstyle': texOldstyleBold,
@@ -285,12 +285,12 @@ CommonTeXFontMixin<CHTMLCharOptions, CHTMLVariantData, CHTMLDelimiterData, CHTML
 
         '@font-face /* 11 */': {
             'font-family': 'MJXTEX-C',
-            src: 'url("%%URL%%/MathJax_Caligraphic-Regular.woff") format("woff")'
+            src: 'url("%%URL%%/MathJax_Calligraphic-Regular.woff") format("woff")'
         },
 
         '@font-face /* 12 */': {
             'font-family': 'MJXTEX-C-B',
-            src: 'url("%%URL%%/MathJax_Caligraphic-Bold.woff") format("woff")'
+            src: 'url("%%URL%%/MathJax_Calligraphic-Bold.woff") format("woff")'
         },
 
         '@font-face /* 13 */': {
diff --git a/mathjax3-ts/output/chtml/fonts/tex/tex-caligraphic-bold.ts b/mathjax3-ts/output/chtml/fonts/tex/tex-calligraphic-bold.ts
similarity index 94%
rename from mathjax3-ts/output/chtml/fonts/tex/tex-caligraphic-bold.ts
rename to mathjax3-ts/output/chtml/fonts/tex/tex-calligraphic-bold.ts
index 3d385f7cb..eb0637d6c 100644
--- a/mathjax3-ts/output/chtml/fonts/tex/tex-caligraphic-bold.ts
+++ b/mathjax3-ts/output/chtml/fonts/tex/tex-calligraphic-bold.ts
@@ -16,9 +16,9 @@
  */
 
 import {CHTMLCharMap, AddCSS} from '../../FontData.js';
-import {texCaligraphicBold as font} from '../../../common/fonts/tex/tex-caligraphic-bold.js';
+import {texCalligraphicBold as font} from '../../../common/fonts/tex/tex-calligraphic-bold.js';
 
-export const texCaligraphicBold: CHTMLCharMap = AddCSS(font, {
+export const texCalligraphicBold: CHTMLCharMap = AddCSS(font, {
     0x20: {c: ' '},
     0x2F: {c: '/'},
     0x30: {c: '0'},
diff --git a/mathjax3-ts/output/chtml/fonts/tex/tex-caligraphic.ts b/mathjax3-ts/output/chtml/fonts/tex/tex-calligraphic.ts
similarity index 93%
rename from mathjax3-ts/output/chtml/fonts/tex/tex-caligraphic.ts
rename to mathjax3-ts/output/chtml/fonts/tex/tex-calligraphic.ts
index 244a84d3e..842cc534e 100644
--- a/mathjax3-ts/output/chtml/fonts/tex/tex-caligraphic.ts
+++ b/mathjax3-ts/output/chtml/fonts/tex/tex-calligraphic.ts
@@ -16,9 +16,9 @@
  */
 
 import {CHTMLCharMap, AddCSS} from '../../FontData.js';
-import {texCaligraphic as font} from '../../../common/fonts/tex/tex-caligraphic.js';
+import {texCalligraphic as font} from '../../../common/fonts/tex/tex-calligraphic.js';
 
-export const texCaligraphic: CHTMLCharMap = AddCSS(font, {
+export const texCalligraphic: CHTMLCharMap = AddCSS(font, {
     0x20: {c: ' '},
     0x30: {c: '0'},
     0x31: {c: '1'},
diff --git a/mathjax3-ts/output/common/fonts/tex.ts b/mathjax3-ts/output/common/fonts/tex.ts
index bbb247434..9d628923d 100644
--- a/mathjax3-ts/output/common/fonts/tex.ts
+++ b/mathjax3-ts/output/common/fonts/tex.ts
@@ -44,8 +44,8 @@ export function CommonTeXFontMixin<C extends CharOptions, V extends VariantData<
             ['-largeop', 'normal'],
             ['-size3', 'normal'],
             ['-size4', 'normal'],
-            ['-tex-caligraphic', 'italic'],
-            ['-tex-bold-caligraphic', 'bold-italic'],
+            ['-tex-calligraphic', 'italic'],
+            ['-tex-bold-calligraphic', 'bold-italic'],
             ['-tex-oldstyle', 'normal'],
             ['-tex-bold-oldstyle', 'bold'],
             ['-tex-mathit', 'italic'],
@@ -61,8 +61,8 @@ export function CommonTeXFontMixin<C extends CharOptions, V extends VariantData<
             '-largeop': ['serif', false, false],
             '-size3': ['serif', false, false],
             '-size4': ['serif', false, false],
-            '-tex-caligraphic': ['cursive', true, false],
-            '-tex-bold-caligraphic': ['cursive', true, true],
+            '-tex-calligraphic': ['cursive', true, false],
+            '-tex-bold-calligraphic': ['cursive', true, true],
             '-tex-oldstyle': ['serif', false, false],
             '-tex-bold-oldstyle': ['serif', false, true],
             '-tex-mathit': ['serif', true, false]
diff --git a/mathjax3-ts/output/common/fonts/tex/tex-caligraphic-bold.ts b/mathjax3-ts/output/common/fonts/tex/tex-calligraphic-bold.ts
similarity index 99%
rename from mathjax3-ts/output/common/fonts/tex/tex-caligraphic-bold.ts
rename to mathjax3-ts/output/common/fonts/tex/tex-calligraphic-bold.ts
index 7b3ff4033..9e1096deb 100644
--- a/mathjax3-ts/output/common/fonts/tex/tex-caligraphic-bold.ts
+++ b/mathjax3-ts/output/common/fonts/tex/tex-calligraphic-bold.ts
@@ -17,7 +17,7 @@
 
 import {CharMap, CharOptions} from '../../FontData.js';
 
-export const texCaligraphicBold: CharMap<CharOptions> = {
+export const texCalligraphicBold: CharMap<CharOptions> = {
     0x20: [0, 0, .25],
     0x2F: [.711, .21, .894],
     0x30: [.46, .017, .575],
diff --git a/mathjax3-ts/output/common/fonts/tex/tex-caligraphic.ts b/mathjax3-ts/output/common/fonts/tex/tex-calligraphic.ts
similarity index 98%
rename from mathjax3-ts/output/common/fonts/tex/tex-caligraphic.ts
rename to mathjax3-ts/output/common/fonts/tex/tex-calligraphic.ts
index a0336bf8b..c56351c25 100644
--- a/mathjax3-ts/output/common/fonts/tex/tex-caligraphic.ts
+++ b/mathjax3-ts/output/common/fonts/tex/tex-calligraphic.ts
@@ -17,7 +17,7 @@
 
 import {CharMap, CharOptions} from '../../FontData.js';
 
-export const texCaligraphic: CharMap<CharOptions> = {
+export const texCalligraphic: CharMap<CharOptions> = {
     0x20: [0, 0, .25],
     0x30: [.452, .022, .5],
     0x31: [.453, 0, .5],
diff --git a/mathjax3-ts/output/svg/fonts/tex.ts b/mathjax3-ts/output/svg/fonts/tex.ts
index f7496be2c..e09923c2c 100644
--- a/mathjax3-ts/output/svg/fonts/tex.ts
+++ b/mathjax3-ts/output/svg/fonts/tex.ts
@@ -46,8 +46,8 @@ import {sansSerif} from './tex/sans-serif.js';
 import {scriptBold} from './tex/script-bold.js';
 import {script} from './tex/script.js';
 import {smallop} from './tex/smallop.js';
-import {texCaligraphicBold} from './tex/tex-caligraphic-bold.js';
-import {texCaligraphic} from './tex/tex-caligraphic.js';
+import {texCalligraphicBold} from './tex/tex-calligraphic-bold.js';
+import {texCalligraphic} from './tex/tex-calligraphic.js';
 import {texMathit} from './tex/tex-mathit.js';
 import {texOldstyleBold} from './tex/tex-oldstyle-bold.js';
 import {texOldstyle} from './tex/tex-oldstyle.js';
@@ -91,8 +91,8 @@ CommonTeXFontMixin<SVGCharOptions, SVGVariantData, SVGDelimiterData, SVGFontData
         '-largeop': largeop,
         '-size3': texSize3,
         '-size4': texSize4,
-        '-tex-caligraphic': texCaligraphic,
-        '-tex-bold-caligraphic': texCaligraphicBold,
+        '-tex-calligraphic': texCalligraphic,
+        '-tex-bold-calligraphic': texCalligraphicBold,
         '-tex-mathit': texMathit,
         '-tex-oldstyle': texOldstyle,
         '-tex-bold-oldstyle': texOldstyleBold,
@@ -121,8 +121,8 @@ CommonTeXFontMixin<SVGCharOptions, SVGVariantData, SVGDelimiterData, SVGFontData
         '-largeop': 'LO',
         '-size3': 'S3',
         '-size4': 'S4',
-        '-tex-caligraphic': 'C',
-        '-tex-bold-caligraphic': 'BC',
+        '-tex-calligraphic': 'C',
+        '-tex-bold-calligraphic': 'BC',
         '-tex-mathit': 'MI',
         '-tex-oldstyle': 'OS',
         '-tex-bold-oldstyle': 'BOS',
diff --git a/mathjax3-ts/output/svg/fonts/tex/tex-caligraphic-bold.ts b/mathjax3-ts/output/svg/fonts/tex/tex-calligraphic-bold.ts
similarity index 99%
rename from mathjax3-ts/output/svg/fonts/tex/tex-caligraphic-bold.ts
rename to mathjax3-ts/output/svg/fonts/tex/tex-calligraphic-bold.ts
index 97222a94a..88aa6701c 100644
--- a/mathjax3-ts/output/svg/fonts/tex/tex-caligraphic-bold.ts
+++ b/mathjax3-ts/output/svg/fonts/tex/tex-calligraphic-bold.ts
@@ -16,9 +16,9 @@
  */
 
 import {SVGCharMap, AddPaths} from '../../FontData.js';
-import {texCaligraphicBold as font} from '../../../common/fonts/tex/tex-caligraphic-bold.js';
+import {texCalligraphicBold as font} from '../../../common/fonts/tex/tex-calligraphic-bold.js';
 
-export const texCaligraphicBold: SVGCharMap = AddPaths(font, {
+export const texCalligraphicBold: SVGCharMap = AddPaths(font, {
     0x20: '',
     0x2F: '189 -210Q179 -210 170 -203T160 -179Q160 -171 162 -166Q164 -163 420 266T679 698Q686 711 704 711Q714 711 723 704T733 681Q733 672 730 667Q723 654 469 228T211 -201Q202 -210 189 -210',
     0x30: '259 460H279Q352 460 403 444T491 378Q528 320 528 219Q528 100 475 45Q417 -17 287 -17Q152 -17 99 44T46 219Q46 246 47 265T57 318T82 376T131 422T210 454Q234 460 259 460ZM389 229V271Q389 351 371 380T280 409Q232 409 208 385Q194 371 190 345T185 229V210Q185 108 194 83Q208 35 287 35Q317 35 336 42Q372 55 380 85T389 204V229',
diff --git a/mathjax3-ts/output/svg/fonts/tex/tex-caligraphic.ts b/mathjax3-ts/output/svg/fonts/tex/tex-calligraphic.ts
similarity index 99%
rename from mathjax3-ts/output/svg/fonts/tex/tex-caligraphic.ts
rename to mathjax3-ts/output/svg/fonts/tex/tex-calligraphic.ts
index f31e4beeb..f1a010cca 100644
--- a/mathjax3-ts/output/svg/fonts/tex/tex-caligraphic.ts
+++ b/mathjax3-ts/output/svg/fonts/tex/tex-calligraphic.ts
@@ -16,9 +16,9 @@
  */
 
 import {SVGCharMap, AddPaths} from '../../FontData.js';
-import {texCaligraphic as font} from '../../../common/fonts/tex/tex-caligraphic.js';
+import {texCalligraphic as font} from '../../../common/fonts/tex/tex-calligraphic.js';
 
-export const texCaligraphic: SVGCharMap = AddPaths(font, {
+export const texCalligraphic: SVGCharMap = AddPaths(font, {
     0x20: '',
     0x30: '39 213Q39 274 53 319T89 389T139 429T192 448T242 452Q347 452 400 400Q460 335 460 213Q460 -22 250 -22Q39 -22 39 213ZM364 242Q364 279 363 301T355 348T338 385T306 406T254 415Q250 415 245 415T238 416Q217 416 190 404T150 368Q136 339 136 221Q136 114 146 78T200 23Q219 16 250 16Q280 16 299 23Q341 41 352 77T364 221V242',
     0x31: '116 410Q176 412 215 423T269 443T288 453H291Q293 453 301 447V254Q301 62 303 60Q307 52 322 49T394 46Q418 46 422 43T426 23Q426 8 424 4T411 0Q407 0 369 1T258 2T148 1T106 0Q96 0 94 4T91 23Q91 40 95 43T123 46Q180 46 195 49T215 61Q216 63 216 220V376Q192 367 119 364H93L86 371V403L92 410H116',