diff --git a/plugins/org.eclipse.jst.server.core/plugin.xml b/plugins/org.eclipse.jst.server.core/plugin.xml
index e3847d8..8115db2 100644
--- a/plugins/org.eclipse.jst.server.core/plugin.xml
+++ b/plugins/org.eclipse.jst.server.core/plugin.xml
@@ -194,7 +194,7 @@
 
 <extension point="org.eclipse.wst.server.core.runtimeTypes">
     <runtimeType
-       id="org.eclipse.jst.server.core.preview.runtimeType"
+       id="org.eclipse.jst.server.preview.runtime"
        name="%previewRuntimeTypeName"
        description="%previewRuntimeTypeDescription"
        class="org.eclipse.jst.server.core.internal.preview.PreviewRuntime">
@@ -212,7 +212,7 @@
 
   <extension point="org.eclipse.wst.server.core.serverTypes">
      <serverType
-       id="org.eclipse.jst.server.core.preview.serverType"
+       id="org.eclipse.jst.server.preview.server"
        name="%previewServerTypeName"
        description="%previewServerTypeDescription"
        supportsRemoteHosts="false"
@@ -221,29 +221,29 @@
        hasConfiguration="false"
        launchModes="run,debug,profile"
        launchConfigId="org.eclipse.jst.server.core.preview.launchConfigurationType"
-       runtimeTypeId="org.eclipse.jst.server.core.preview.runtimeType"
+       runtimeTypeId="org.eclipse.jst.server.preview.runtime"
        class="org.eclipse.jst.server.core.internal.preview.PreviewServer"
        behaviourClass="org.eclipse.jst.server.core.internal.preview.PreviewServerBehaviour"/>
   </extension>
  
   <extension point="org.eclipse.jst.server.core.runtimeClasspathProviders">
     <runtimeClasspathProvider
-      id="org.eclipse.jst.server.core.preview.runtimeTarget"
-      runtimeTypeIds="org.eclipse.jst.server.core.preview.runtimeType"
+      id="org.eclipse.jst.server.preview.runtimeTarget"
+      runtimeTypeIds="org.eclipse.jst.server.preview.runtime"
       class="org.eclipse.jst.server.core.internal.preview.PreviewRuntimeClasspathProvider"/>
   </extension>
 
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
     <runtime-component-type
-       id="org.eclipse.jst.server.core.preview.runtimeType"/>
+       id="org.eclipse.jst.server.preview.runtime"/>
 
     <runtime-component-version
-       type="org.eclipse.jst.server.core.preview.runtimeType"
+       type="org.eclipse.jst.server.preview.runtime"
        version="1.0"/>
 
     <adapter>
       <runtime-component
-         id="org.eclipse.jst.server.core.preview.runtimeType"/>
+         id="org.eclipse.jst.server.preview.runtime"/>
       <factory
          class="org.eclipse.jst.server.core.internal.RuntimeClasspathProvider$Factory"/>
       <type
@@ -252,7 +252,7 @@
 
     <supported>
       <runtime-component
-         id="org.eclipse.jst.server.core.preview.runtimeType"
+         id="org.eclipse.jst.server.preview.runtime"
          version="1.0"/>
       <facet
          id="wst.web"
@@ -268,8 +268,8 @@
 
   <extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
     <runtimeFacetMapping
-      runtimeTypeId="org.eclipse.jst.server.core.preview.runtimeType"
-      runtime-component="org.eclipse.jst.server.core.preview.runtimeType"
+      runtimeTypeId="org.eclipse.jst.server.preview.runtime"
+      runtime-component="org.eclipse.jst.server.preview.runtime"
       version="1.0"/>
   </extension>
 
@@ -291,7 +291,7 @@
 
   <extension point="org.eclipse.wst.server.core.launchableAdapters">
     <launchableAdapter
-      id="org.eclipse.jst.server.core.preview.serverType"
+      id="org.eclipse.jst.server.core.preview.server"
       class="org.eclipse.jst.server.core.internal.preview.PreviewLaunchableAdapterDelegate"/>
   </extension>
 
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/preview/PreviewRuntime.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/preview/PreviewRuntime.java
index 895608c..a9214df 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/preview/PreviewRuntime.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/preview/PreviewRuntime.java
@@ -26,7 +26,8 @@
  * 
  */
 public class PreviewRuntime extends RuntimeDelegate implements IJavaRuntime {
-	public static final String ID = "org.eclipse.jst.server.core.preview.runtimeType";
+	public static final String ID = "org.eclipse.jst.server.preview.runtime";
+
 	protected static final String PROP_VM_INSTALL_TYPE_ID = "vm-install-type-id";
 	protected static final String PROP_VM_INSTALL_ID = "vm-install-id";
 
diff --git a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/preview/PreviewServer.java b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/preview/PreviewServer.java
index 63743a8..5c77733 100644
--- a/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/preview/PreviewServer.java
+++ b/plugins/org.eclipse.jst.server.core/sjavacore/org/eclipse/jst/server/core/internal/preview/PreviewServer.java
@@ -37,7 +37,8 @@
  * Generic HTTP server.
  */
 public class PreviewServer extends ServerDelegate implements IURLProvider {
-	public static final String ID = "org.eclipse.jst.server.core.preview.serverType";
+	public static final String ID = "org.eclipse.jst.server.preview.server";
+
 	public static final String PROPERTY_PORT = "port";
 
 	/**
diff --git a/plugins/org.eclipse.jst.server.ui/plugin.xml b/plugins/org.eclipse.jst.server.ui/plugin.xml
index d161e95..4a5fd18 100644
--- a/plugins/org.eclipse.jst.server.ui/plugin.xml
+++ b/plugins/org.eclipse.jst.server.ui/plugin.xml
@@ -102,18 +102,18 @@
   <extension point="org.eclipse.wst.server.ui.serverImages">
      <image
         id="org.eclipse.jst.server.ui"
-        typeIds="org.eclipse.jst.server.core.preview.runtimeType,org.eclipse.jst.server.core.preview.serverType"
+        typeIds="org.eclipse.jst.server.preview.runtime,org.eclipse.jst.server.preview.server"
         icon="icons/obj16/preview.gif"/>
   </extension>
 
   <extension point="org.eclipse.wst.common.project.facet.ui.images">
-    <image runtime-component-type="org.eclipse.jst.server.preview.core.runtimeType"
+    <image runtime-component-type="org.eclipse.jst.server.preview.runtime"
        path="icons/obj16/preview.gif"/>
   </extension>
 
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
     <adapter>
-      <runtime-component id="org.eclipse.jst.server.preview.core.runtimeType"/>
+      <runtime-component id="org.eclipse.jst.server.preview.runtime"/>
       <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
       <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
     </adapter>
@@ -137,7 +137,7 @@
 
   <extension point="org.eclipse.wst.common.project.facet.core.runtimes">
     <adapter>
-      <runtime-component id="org.eclipse.jst.server.core.preview.runtimeType"/>
+      <runtime-component id="org.eclipse.jst.server.preview.runtime"/>
       <factory class="org.eclipse.jst.server.ui.internal.RuntimeLabelProvider$Factory"/>
       <type class="org.eclipse.wst.common.project.facet.ui.IRuntimeComponentLabelProvider"/>
     </adapter>