3 files changed, 12 insertions, 12 deletions
diff --git a/metapost/context/base/mp-mlib.mpiv b/metapost/context/base/mp-mlib.mpiv
index 81b09d6dc..abf0eb974 100644
--- a/metapost/context/base/mp-mlib.mpiv
+++ b/metapost/context/base/mp-mlib.mpiv
@@ -281,9 +281,9 @@ enddef ;
 let mfun_label    = label ;
 let mfun_thelabel = thelabel ;
 
-def useplainlabels =
-    let label    = plain_label ;
-    let thelabel = plain_thelabel ;
+def useplainlabels = % somehow let doesn't work for all code
+    def label    = plain_label    enddef ;
+    def thelabel = plain_thelabel enddef ;
 enddef ;
 
 def usemetafunlabels =
@@ -291,7 +291,7 @@ def usemetafunlabels =
     let thelabel = mfun_thelabel ;
 enddef ;
 
-plain_compatibity_data := plain_compatibity_data & "save label, thelabel ;" & "useplainlabels ;" ;
+plain_compatibility_data := plain_compatibility_data & "save label, thelabel ;" & "useplainlabels ;" ;
 
 % next comes own own:
 
diff --git a/metapost/context/base/mp-tool.mpii b/metapost/context/base/mp-tool.mpii
index 2819a1f66..f363f655e 100644
--- a/metapost/context/base/mp-tool.mpii
+++ b/metapost/context/base/mp-tool.mpii
@@ -100,14 +100,14 @@ enddef ;
 
 %D Plain compatibility
 
-string plain_compatibity_data ; plain_compatibity_data := "" ;
+string plain_compatibility_data ; plain_compatibility_data := "" ;
 
-def startplaincompatibity =
+def startplaincompatibility =
     begingroup ;
-    scantokens plain_compatibity_data ;
+    scantokens plain_compatibility_data ;
 enddef ;
 
-def stopplaincompatibity =
+def stopplaincompatibility =
     endgroup ;
 enddef ;
 
diff --git a/metapost/context/base/mp-tool.mpiv b/metapost/context/base/mp-tool.mpiv
index b47f5e8bf..7f6972bf2 100644
--- a/metapost/context/base/mp-tool.mpiv
+++ b/metapost/context/base/mp-tool.mpiv
@@ -66,14 +66,14 @@ enddef ;
 
 %D Plain compatibility:
 
-string plain_compatibity_data ; plain_compatibity_data := "" ;
+string plain_compatibility_data ; plain_compatibility_data := "" ;
 
-def startplaincompatibity =
+def startplaincompatibility =
     begingroup ;
-    scantokens plain_compatibity_data ;
+    scantokens plain_compatibility_data ;
 enddef ;
 
-def stopplaincompatibity =
+def stopplaincompatibility =
     endgroup ;
 enddef ;