diff --git a/extensions/source/oooimprovement/invite_job.cxx b/extensions/source/oooimprovement/invite_job.cxx
index 8bf4a3c5d241..69036826432f 100644
--- a/extensions/source/oooimprovement/invite_job.cxx
+++ b/extensions/source/oooimprovement/invite_job.cxx
@@ -121,7 +121,7 @@ namespace oooimprovement
     Sequence<OUString> SAL_CALL InviteJob::getSupportedServiceNames_static()
     {
         Sequence<OUString> aServiceNames(1);
-        aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob");
+        aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.AsyncJob");
         return aServiceNames;
     }
 
diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index a92044b87d7e..5468e51d2616 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -190,7 +190,7 @@ namespace oooimprovement
     Sequence<OUString> SAL_CALL OnLogRotateJob::getSupportedServiceNames_static()
     {
         Sequence<OUString> aServiceNames(1);
-        aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.XAsyncJob");
+        aServiceNames[0] = OUString::createFromAscii("com.sun.star.task.AsyncJob");
         return aServiceNames;
     }
 
diff --git a/extensions/source/oooimprovement/oooimprovement.component b/extensions/source/oooimprovement/oooimprovement.component
index ac4d6cca1584..e133f932c199 100644
--- a/extensions/source/oooimprovement/oooimprovement.component
+++ b/extensions/source/oooimprovement/oooimprovement.component
@@ -28,13 +28,11 @@
 
 <component loader="com.sun.star.loader.SharedLibrary"
     xmlns="http://openoffice.org/2010/uno-components">
-  <implementation name="com.sun.star.comp.extensions.oooimprovement.CoreController">
+  <implementation
+      name="com.sun.star.comp.extensions.oooimprovement.CoreController">
     <service name="com.sun.star.oooimprovement.CoreController"/>
   </implementation>
-  <implementation name="com.sun.star.comp.extensions.oooimprovement.InviteJob">
-    <service name="com.sun.star.task.XAsyncJob"/>
-  </implementation>
-  <implementation name="com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob">
-    <service name="com.sun.star.task.XAsyncJob"/>
-  </implementation>
+  <implementation name="com.sun.star.comp.extensions.oooimprovement.InviteJob"/>
+  <implementation
+      name="com.sun.star.comp.extensions.oooimprovement.OnLogRotateJob"/>
 </component>
diff --git a/forms/util/frm.component b/forms/util/frm.component
index 0305d03ed54e..c727e805940a 100644
--- a/forms/util/frm.component
+++ b/forms/util/frm.component
@@ -29,18 +29,14 @@
 <component loader="com.sun.star.loader.SharedLibrary"
     xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="com.sun.star.comp.form.ONavigationBarControl">
-    <service name="com.sun.star.awt.UnoControl"/>
     <service name="com.sun.star.form.control.NavigationToolBar"/>
   </implementation>
   <implementation name="com.sun.star.comp.form.ONavigationBarModel">
-    <service name="com.sun.star.awt.UnoControlModel"/>
     <service name="com.sun.star.form.FormComponent"/>
     <service name="com.sun.star.form.FormControlModel"/>
     <service name="com.sun.star.form.component.NavigationToolBar"/>
   </implementation>
   <implementation name="com.sun.star.comp.form.ORichTextControl">
-    <service name="com.sun.star.awt.UnoControl"/>
-    <service name="com.sun.star.awt.UnoControlEdit"/>
     <service name="com.sun.star.form.control.RichTextControl"/>
   </implementation>
   <implementation name="com.sun.star.comp.forms.FormOperations">