diff --git a/Compiler/BackEnd/BackendQSS.mo b/Compiler/BackEnd/BackendQSS.mo
index 6f5c2fa4c75..8a015b79044 100644
--- a/Compiler/BackEnd/BackendQSS.mo
+++ b/Compiler/BackEnd/BackendQSS.mo
@@ -693,7 +693,7 @@ algorithm
     /* TODO: Check matrix A for discrete values */
     vars_cref = List.intersectionOnTrue(listAppend(states,listAppend(disc,algs)),vars_cref,ComponentReference.crefEqual);
     then vars_cref;
-  end matchcontinue;
+  end match;
 end getRHSVars;
 
 function getInitExp
@@ -900,7 +900,7 @@ algorithm
     /* TODO: Check matrix A for discrete values */
     vars_cref = List.intersectionOnTrue(listAppend(states,listAppend(disc,algs)),vars_cref,ComponentReference.crefEqual);
     then vars_cref;
-  end matchcontinue;
+  end match;
 
 end getDiscRHSVars;
 
diff --git a/Compiler/BackEnd/MathematicaDump.mo b/Compiler/BackEnd/MathematicaDump.mo
index bc4f3d4e7b6..08fa141c457 100644
--- a/Compiler/BackEnd/MathematicaDump.mo
+++ b/Compiler/BackEnd/MathematicaDump.mo
@@ -540,11 +540,10 @@ protected function lbinopSymbolMma "Return string representation of logical bina
   input DAE.Operator inOperator;
   output String outString;
 algorithm 
-  outString:=
-  matchcontinue (inOperator)
+  outString := match (inOperator)
     case (DAE.AND(_)) then " && "; 
     case (DAE.OR(_)) then " || "; 
-  end matchcontinue;
+  end match;
 end lbinopSymbolMma;
 
 protected function lunaryopSymbolMma "
@@ -553,10 +552,9 @@ protected function lunaryopSymbolMma "
   input DAE.Operator inOperator;
   output String outString;
 algorithm 
-  outString:=
-  matchcontinue (inOperator)
+  outString := match (inOperator)
     case (DAE.NOT(_)) then " ! "; 
-  end matchcontinue;
+  end match;
 end lunaryopSymbolMma;
 
 protected function relopSymbolMma "
@@ -565,8 +563,7 @@ protected function relopSymbolMma "
   input DAE.Operator inOperator;
   output String outString;
 algorithm 
-  outString:=
-  matchcontinue (inOperator)
+  outString := matchcontinue (inOperator)
     case (DAE.LESS(ty = _)) then " < "; 
     case (DAE.LESSEQ(ty = _)) then " <= "; 
     case (DAE.GREATER(ty = _)) then " > "; 
diff --git a/Compiler/BackEnd/Uncertainties.mo b/Compiler/BackEnd/Uncertainties.mo
index 3df733a703d..78b6eded8f5 100644
--- a/Compiler/BackEnd/Uncertainties.mo
+++ b/Compiler/BackEnd/Uncertainties.mo
@@ -599,7 +599,7 @@ outEq:=matchcontinue(dae,uncertainVariables)
   case (BackendDAE.DAE(BackendDAE.EQSYSTEM(_,_,SOME(m),_,_)::_,_),uncertainVariables)
    then
      getEquationsWithOneVariable2(arrayList(m),uncertainVariables,1);
-end matchcontinue;     
+end match;     
 end getEquationsWithOneVariable;
 
 protected function getEquationsWithOneVariable2