diff --git a/org.eclipse.remote.core/plugin.xml b/org.eclipse.remote.core/plugin.xml
index b6b97bf4f55..51d1c09de37 100644
--- a/org.eclipse.remote.core/plugin.xml
+++ b/org.eclipse.remote.core/plugin.xml
@@ -7,27 +7,12 @@
          point="org.eclipse.remote.core.remoteServices">
       <remoteServices
             class="org.eclipse.internal.remote.core.services.local.LocalServicesFactory"
-            id="org.eclipse.ptp.remote.LocalServices"
+            id="org.eclipse.remote.LocalServices"
             name="Local"
             newConnections="false"
             scheme="file">
       </remoteServices>
    </extension>
-   <extension
-         point="org.eclipse.core.variables.valueVariables">
-      <variable
-            description="payload"
-            initialValue="&quot;&quot;"
-            name="payload"
-            readOnly="false">
-      </variable>
-      <variable
-            description="payload_args"
-            initialValue="&quot;&quot;"
-            name="payload_args"
-            readOnly="false">
-      </variable>
-   </extension>
    <extension
          point="org.eclipse.core.runtime.adapters">
       <factory
diff --git a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java b/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java
index 9a78e74122b..5cc65f6e430 100644
--- a/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java
+++ b/org.eclipse.remote.core/src/org/eclipse/internal/remote/core/services/local/LocalServices.java
@@ -23,7 +23,7 @@ import org.eclipse.remote.core.IRemoteServices;
 import org.eclipse.remote.core.IRemoteServicesDescriptor;
 
 public class LocalServices implements IRemoteServices {
-	public static final String LocalServicesId = "org.eclipse.ptp.remote.LocalServices"; //$NON-NLS-1$
+	public static final String LocalServicesId = "org.eclipse.remote.LocalServices"; //$NON-NLS-1$
 
 	private IRemoteFileManager fFileMgr = null;
 	private final IRemoteConnectionManager fConnMgr = new LocalConnectionManager(this);