3 files changed, 4 insertions, 16 deletions
diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx
index a5e05d2bf4f1..07da391c5601 100644
--- a/shell/source/cmdmail/cmdmailsuppl.cxx
+++ b/shell/source/cmdmail/cmdmailsuppl.cxx
@@ -60,12 +60,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::configuration;
 
-#define COMP_IMPL_NAME  "com.sun.star.comp.system.SimpleCommandMail2"
-
-
-// helper functions
-
-
 namespace // private
 {
     Sequence< OUString > SAL_CALL Component_getSupportedServiceNames()
@@ -313,7 +307,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM
 OUString SAL_CALL CmdMailSuppl::getImplementationName(  )
     throw( RuntimeException, std::exception )
 {
-    return OUString(COMP_IMPL_NAME);
+    return OUString("com.sun.star.comp.system.SimpleCommandMail");
 }
 
 //  XServiceInfo
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index 34bef4081f24..0239a668f1ff 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -55,18 +55,12 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::system::SystemShellExecuteFlags;
 using namespace cppu;
 
-#define SHELLEXEC_IMPL_NAME  "com.sun.star.comp.system.SystemShellExecute2"
-
-
-// helper functions
-
-
 namespace // private
 {
     Sequence< OUString > SAL_CALL ShellExec_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = "com.sun.star.sys.shell.SystemShellExecute";
+        aRet[0] = "com.sun.star.system.SystemShellExecute";
         return aRet;
     }
 }
@@ -273,7 +267,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
 OUString SAL_CALL ShellExec::getImplementationName(  )
     throw( RuntimeException, std::exception )
 {
-    return OUString(SHELLEXEC_IMPL_NAME );
+    return OUString("com.sun.star.comp.system.SystemShellExecute");
 }
 
 //  XServiceInfo
diff --git a/shell/source/win32/SysShExec.cxx b/shell/source/win32/SysShExec.cxx
index 9dd0efddf2a5..18e78fc8e40f 100644
--- a/shell/source/win32/SysShExec.cxx
+++ b/shell/source/win32/SysShExec.cxx
@@ -68,7 +68,7 @@ namespace // private
     Sequence< OUString > SAL_CALL SysShExec_getSupportedServiceNames()
     {
         Sequence< OUString > aRet(1);
-        aRet[0] = "com.sun.star.sys.shell.SystemShellExecute";
+        aRet[0] = "com.sun.star.system.SystemShellExecute";
         return aRet;
     }