diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index b6d0c7193e5f..e7c5dee90c4d 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -70,8 +70,8 @@
 #include "ooxmlexport.hxx"
 #include "ooxmlimport.hxx"
 #include "rtfexport.hxx"
-#include <import.hxx>
-#include <export.hxx>
+#include <mathmlimport.hxx>
+#include <mathmlexport.hxx>
 #include <svx/svxids.hrc>
 #include <cursor.hxx>
 #include <comphelper/diagnose_ex.hxx>
@@ -596,7 +596,8 @@ bool SmDocShell::ConvertFrom(SfxMedium &rMedium)
             InvalidateCursor();
         }
         Reference<css::frame::XModel> xModel(GetModel());
-        SmMLImportWrapper aEquation(xModel);
+        SmXMLImportWrapper aEquation(xModel);
+        aEquation.useHTMLMLEntities(true);
         bSuccess = ( ERRCODE_NONE == aEquation.Import(rMedium) );
     }
     else
@@ -656,7 +657,7 @@ bool SmDocShell::Load( SfxMedium& rMedium )
         {
             // is this a fabulous math package ?
             Reference<css::frame::XModel> xModel(GetModel());
-            SmMLImportWrapper aEquation(xModel);
+            SmXMLImportWrapper aEquation(xModel);
             auto nError = aEquation.Import(rMedium);
             bRet = ERRCODE_NONE == nError;
             SetError(nError);
@@ -687,8 +688,8 @@ bool SmDocShell::Save()
             ArrangeFormula();
 
         Reference<css::frame::XModel> xModel(GetModel());
-        SmMLExportWrapper aEquation(xModel);
-        aEquation.setFlat(false);
+        SmXMLExportWrapper aEquation(xModel);
+        aEquation.SetFlat(false);
         return aEquation.Export(*GetMedium());
     }
 
@@ -747,8 +748,8 @@ bool SmDocShell::SaveAs( SfxMedium& rMedium )
             ArrangeFormula();
 
         Reference<css::frame::XModel> xModel(GetModel());
-        SmMLExportWrapper aEquation(xModel);
-        aEquation.setFlat(false);
+        SmXMLExportWrapper aEquation(xModel);
+        aEquation.SetFlat(false);
         bRet = aEquation.Export(rMedium);
     }
     return bRet;
@@ -769,16 +770,16 @@ bool SmDocShell::ConvertTo( SfxMedium &rMedium )
         if(rFltName == STAROFFICE_XML)
         {
             Reference<css::frame::XModel> xModel(GetModel());
-            SmMLExportWrapper aEquation(xModel);
-            aEquation.setFlat(false);
+            SmXMLExportWrapper aEquation(xModel);
+            aEquation.SetFlat(false);
             bRet = aEquation.Export(rMedium);
         }
         else if(rFltName == MATHML_XML)
         {
             Reference<css::frame::XModel> xModel(GetModel());
-            SmMLExportWrapper aEquation(xModel);
-            aEquation.setFlat(true);
-            aEquation.setUseHTMLMLEntities(true);
+            SmXMLExportWrapper aEquation(xModel);
+            aEquation.SetFlat(true);
+            aEquation.SetUseHTMLMLEntities(true);
             bRet = aEquation.Export(rMedium);
         }
         else if (pFlt->GetFilterName() == "MathType 3.x")
diff --git a/starmath/util/sm.component b/starmath/util/sm.component
index 29eb7c9b4168..2b84a17c429c 100644
--- a/starmath/util/sm.component
+++ b/starmath/util/sm.component
@@ -67,28 +67,4 @@
         constructor="org_libreoffice_comp_Math_sidebar_SmPanelFactory">
     <service name="com.sun.star.ui.UIElementFactory"/>
   </implementation>
-    <implementation name="com.sun.star.comp.Math.MLImporter"
-      constructor="Math_MLImporter_get_implementation">
-    <service name="com.sun.star.xml.MLImportFilter"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.Math.MLOasisMetaImporter"
-      constructor="Math_MLOasisMetaImporter_get_implementation">
-    <service name="com.sun.star.xml.MLImportFilter"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.Math.MLOasisSettingsImporter"
-      constructor="Math_MLOasisSettingsImporter_get_implementation">
-    <service name="com.sun.star.xml.MLImportFilter"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.Math.MLContentExporter"
-      constructor="Math_MLContentExporter_get_implementation">
-    <service name="com.sun.star.xml.MLExportFilter"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.Math.MLOasisMetaExporter"
-      constructor="Math_MLOasisMetaExporter_get_implementation">
-    <service name="com.sun.star.xml.MLExportFilter"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.Math.MLOasisSettingsExporter"
-      constructor="Math_MLOasisSettingsExporter_get_implementation">
-    <service name="com.sun.star.xml.MLExportFilter"/>
-  </implementation>
 </component>