diff --git a/docs/org.eclipse.server.doc.isv/META-INF/MANIFEST.MF b/docs/org.eclipse.server.doc.isv/META-INF/MANIFEST.MF
index b83fd86..66aec1f 100644
--- a/docs/org.eclipse.server.doc.isv/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.server.doc.isv/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Server Tools Docs ISV Plug-in
-Bundle-SymbolicName: org.eclipse.server.doc.isv;singleton:=true
+Bundle-SymbolicName: org.eclipse.servertools.doc.isv;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %plugin.provider
+Bundle-Vendor: %pluginProvider
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
+Bundle-Name: %pluginName
diff --git a/docs/org.eclipse.server.doc.isv/buildExtDocs.xml b/docs/org.eclipse.server.doc.isv/buildExtDocs.xml
index e61988f..67432f6 100644
--- a/docs/org.eclipse.server.doc.isv/buildExtDocs.xml
+++ b/docs/org.eclipse.server.doc.isv/buildExtDocs.xml
@@ -3,7 +3,7 @@
 
 	<property file="buildExtDocs.properties"/>
 	<property name="outputDir" value="${basedir}${file.separator}html${file.separator}extpts_reference"/>
-	<property name="jsfOutputDir" value="${outputDir}${file.separator}serverTools${file.separator}"/>
+	<property name="jsfOutputDir" value="${outputDir}${file.separator}servertools${file.separator}"/>
 
 	<!-- <taskdef name="pde.convertSchemaToHTML" classname="org.eclipse.pde.internal.core.ant.ConvertSchemaToHTML"/> -->
 	
@@ -33,7 +33,7 @@
  		<pathconvert property="ext-doc-ent" refid="ext-docs-list-ent" pathsep="&lt;/file&gt;/n/n&lt;file&gt;">
  			<map from="${jsfOutputDir}" to=""/>
  		</pathconvert>
- 		<echo file="servertoolsextdocs.xml">&lt;files component="serverTools"&gt;&lt;file&gt;${ext-doc-ent}&lt;/file&gt;&lt;/files&gt;</echo>
+ 		<echo file="servertoolsextdocs.xml">&lt;files component="servertools"&gt;&lt;file&gt;${ext-doc-ent}&lt;/file&gt;&lt;/files&gt;</echo>
  		 						
  	</target>
 	
diff --git a/docs/org.eclipse.server.doc.isv/extDocListings.xml b/docs/org.eclipse.server.doc.isv/extDocListings.xml
index c77ecc9..872ba5f 100644
--- a/docs/org.eclipse.server.doc.isv/extDocListings.xml
+++ b/docs/org.eclipse.server.doc.isv/extDocListings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <components>
-	<component name="Server Tools" id="serverTools" file="serverToolsextdocs.xml"/>
+	<component name="Server Tools" id="servertools" file="servertoolsextdocs.xml"/>
 </components>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/index.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/index.html
index df85bb8..95fa8ec 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/index.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/index.html
@@ -13,94 +13,94 @@
 <center>
 <h1>Server Tools Extension Points </h1>
 </center>The following extension points can be used to extend the capabilities of the Server Tools infrastructure: <h3>
-<a name="serverTools"></a>Server Tools</h3>
+<a name="servertools"></a>Server Tools</h3>
 <ul>
 <li>
-<a href="serverTools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html">org.eclipse.jst.server.core.internalRuntimeComponentProviders</a>
+<a href="servertools/org_eclipse_jst_server_core_internalRuntimeComponentProviders.html">org.eclipse.jst.server.core.internalRuntimeComponentProviders</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_jst_server_core_runtimeClasspathProviders.html">org.eclipse.jst.server.core.runtimeClasspathProviders</a>
+<a href="servertools/org_eclipse_jst_server_core_runtimeClasspathProviders.html">org.eclipse.jst.server.core.runtimeClasspathProviders</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_jst_server_core_runtimeFacetMappings.html">org.eclipse.jst.server.core.runtimeFacetMappings</a>
+<a href="servertools/org_eclipse_jst_server_core_runtimeFacetMappings.html">org.eclipse.jst.server.core.runtimeFacetMappings</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_jst_server_core_serverProfilers.html">org.eclipse.jst.server.core.serverProfilers</a>
+<a href="servertools/org_eclipse_jst_server_core_serverProfilers.html">org.eclipse.jst.server.core.serverProfilers</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_clients.html">org.eclipse.wst.server.core.clients</a>
+<a href="servertools/org_eclipse_wst_server_core_clients.html">org.eclipse.wst.server.core.clients</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_installableRuntimes.html">org.eclipse.wst.server.core.installableRuntimes</a>
+<a href="servertools/org_eclipse_wst_server_core_installableRuntimes.html">org.eclipse.wst.server.core.installableRuntimes</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_installableServers.html">org.eclipse.wst.server.core.installableServers</a>
+<a href="servertools/org_eclipse_wst_server_core_installableServers.html">org.eclipse.wst.server.core.installableServers</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_internalServerMonitors.html">org.eclipse.wst.server.core.internalServerMonitors</a>
+<a href="servertools/org_eclipse_wst_server_core_internalServerMonitors.html">org.eclipse.wst.server.core.internalServerMonitors</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_internalStartup.html">org.eclipse.wst.server.core.internalStartup</a>
+<a href="servertools/org_eclipse_wst_server_core_internalStartup.html">org.eclipse.wst.server.core.internalStartup</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_launchableAdapters.html">org.eclipse.wst.server.core.launchableAdapters</a>
+<a href="servertools/org_eclipse_wst_server_core_launchableAdapters.html">org.eclipse.wst.server.core.launchableAdapters</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_moduleArtifactAdapters.html">org.eclipse.wst.server.core.moduleArtifactAdapters</a>
+<a href="servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html">org.eclipse.wst.server.core.moduleArtifactAdapters</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_moduleFactories.html">org.eclipse.wst.server.core.moduleFactories</a>
+<a href="servertools/org_eclipse_wst_server_core_moduleFactories.html">org.eclipse.wst.server.core.moduleFactories</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_moduleTypes.html">org.eclipse.wst.server.core.moduleTypes</a>
+<a href="servertools/org_eclipse_wst_server_core_moduleTypes.html">org.eclipse.wst.server.core.moduleTypes</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_publishers.html">org.eclipse.wst.server.core.publishers</a>
+<a href="servertools/org_eclipse_wst_server_core_publishers.html">org.eclipse.wst.server.core.publishers</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_publishTasks.html">org.eclipse.wst.server.core.publishTasks</a>
+<a href="servertools/org_eclipse_wst_server_core_publishTasks.html">org.eclipse.wst.server.core.publishTasks</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html">org.eclipse.wst.server.core.runtimeFacetComponentProviders</a>
+<a href="servertools/org_eclipse_wst_server_core_runtimeFacetComponentProviders.html">org.eclipse.wst.server.core.runtimeFacetComponentProviders</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_runtimeLocators.html">org.eclipse.wst.server.core.runtimeLocators</a>
+<a href="servertools/org_eclipse_wst_server_core_runtimeLocators.html">org.eclipse.wst.server.core.runtimeLocators</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_runtimeTargetHandlers.html">org.eclipse.wst.server.core.runtimeTargetHandlers</a>
+<a href="servertools/org_eclipse_wst_server_core_runtimeTargetHandlers.html">org.eclipse.wst.server.core.runtimeTargetHandlers</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_runtimeTypes.html">org.eclipse.wst.server.core.runtimeTypes</a>
+<a href="servertools/org_eclipse_wst_server_core_runtimeTypes.html">org.eclipse.wst.server.core.runtimeTypes</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_serverLocators.html">org.eclipse.wst.server.core.serverLocators</a>
+<a href="servertools/org_eclipse_wst_server_core_serverLocators.html">org.eclipse.wst.server.core.serverLocators</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_core_serverTypes.html">org.eclipse.wst.server.core.serverTypes</a>
+<a href="servertools/org_eclipse_wst_server_core_serverTypes.html">org.eclipse.wst.server.core.serverTypes</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_ui_audio.html">org.eclipse.wst.server.ui.audio</a>
+<a href="servertools/org_eclipse_wst_server_ui_audio.html">org.eclipse.wst.server.ui.audio</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_ui_editorActions.html">org.eclipse.wst.server.ui.editorActions</a>
+<a href="servertools/org_eclipse_wst_server_ui_editorActions.html">org.eclipse.wst.server.ui.editorActions</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_ui_editorPages.html">org.eclipse.wst.server.ui.editorPages</a>
+<a href="servertools/org_eclipse_wst_server_ui_editorPages.html">org.eclipse.wst.server.ui.editorPages</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_ui_editorPageSections.html">org.eclipse.wst.server.ui.editorPageSections</a>
+<a href="servertools/org_eclipse_wst_server_ui_editorPageSections.html">org.eclipse.wst.server.ui.editorPageSections</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_ui_initialSelectionProvider.html">org.eclipse.wst.server.ui.initialSelectionProvider</a>
+<a href="servertools/org_eclipse_wst_server_ui_initialSelectionProvider.html">org.eclipse.wst.server.ui.initialSelectionProvider</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_ui_serverImages.html">org.eclipse.wst.server.ui.serverImages</a>
+<a href="servertools/org_eclipse_wst_server_ui_serverImages.html">org.eclipse.wst.server.ui.serverImages</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_ui_serverToolTip.html">org.eclipse.wst.server.ui.serverToolTip</a>
+<a href="servertools/org_eclipse_wst_server_ui_serverToolTip.html">org.eclipse.wst.server.ui.serverToolTip</a>
 </li>
 <li>
-<a href="serverTools/org_eclipse_wst_server_ui_wizardFragments.html">org.eclipse.wst.server.ui.wizardFragments</a>
+<a href="servertools/org_eclipse_wst_server_ui_wizardFragments.html">org.eclipse.wst.server.ui.wizardFragments</a>
 </li>
 </ul>
 </body>
diff --git a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
index cb4a314..e6341ec 100644
--- a/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
+++ b/docs/org.eclipse.server.doc.isv/html/extpts_reference/servertools/org_eclipse_wst_server_core_moduleArtifactAdapters.html
@@ -8,7 +8,7 @@
 <BODY>
 <H1 style="text-align:center">Module Artifact Adapters</H1>
 <p></p>
-<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.server.ui.moduleArtifactAdapters<p></p>
+<h6 class="CaptionFigColumn SchemaHeader">Identifier: </h6>org.eclipse.wst.server.core.moduleArtifactAdapters<p></p>
 <h6 class="CaptionFigColumn SchemaHeader">Since: </h6><b>This extension point is part of an interim API that is still under development and expected to change significantly before reaching stability. It is being made available at this early stage to solicit feedback from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken (repeatedly) as the API evolves.</b>
 <p></p>
 
@@ -235,7 +235,7 @@
 
 <br>
 <p class="note SchemaCopyright">
-Copyright (c) 2000, 2005 IBM Corporation and others.<br>
+Copyright (c) 2000, 2008 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at 
diff --git a/docs/org.eclipse.server.doc.isv/plugin.properties b/docs/org.eclipse.server.doc.isv/plugin.properties
index cbb15ad..465d8a1 100644
--- a/docs/org.eclipse.server.doc.isv/plugin.properties
+++ b/docs/org.eclipse.server.doc.isv/plugin.properties
@@ -1,10 +1,12 @@
 ###############################################################################
-# Copyright (c) 2005 Oracle Corporation.
+# Copyright (c) 2008 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
+# Contributors:
+#     IBM Corporation - initial API and implementation
 ###############################################################################
-plugin.name = Server Tools - Developer Guide
-plugin.provider = Eclipse.org
\ No newline at end of file
+pluginName=Server Tools - Developer Guide
+pluginProvider=Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml b/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml
index 2230422..c26677d 100644
--- a/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml
+++ b/docs/org.eclipse.server.doc.isv/servertoolsextdocs.xml
@@ -1 +1 @@
-<files component="serverTools"><file>org_eclipse_jst_server_core_internalRuntimeComponentProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeClasspathProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeFacetMappings.html</file>/n/n<file>org_eclipse_jst_server_core_serverProfilers.html</file>/n/n<file>org_eclipse_wst_server_core_clients.html</file>/n/n<file>org_eclipse_wst_server_core_installableRuntimes.html</file>/n/n<file>org_eclipse_wst_server_core_installableServers.html</file>/n/n<file>org_eclipse_wst_server_core_internalServerMonitors.html</file>/n/n<file>org_eclipse_wst_server_core_internalStartup.html</file>/n/n<file>org_eclipse_wst_server_core_launchableAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleArtifactAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleFactories.html</file>/n/n<file>org_eclipse_wst_server_core_moduleTypes.html</file>/n/n<file>org_eclipse_wst_server_core_publishTasks.html</file>/n/n<file>org_eclipse_wst_server_core_publishers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeFacetComponentProviders.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeLocators.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTargetHandlers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTypes.html</file>/n/n<file>org_eclipse_wst_server_core_serverLocators.html</file>/n/n<file>org_eclipse_wst_server_core_serverTypes.html</file>/n/n<file>org_eclipse_wst_server_ui_audio.html</file>/n/n<file>org_eclipse_wst_server_ui_editorActions.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPageSections.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPages.html</file>/n/n<file>org_eclipse_wst_server_ui_initialSelectionProvider.html</file>/n/n<file>org_eclipse_wst_server_ui_serverImages.html</file>/n/n<file>org_eclipse_wst_server_ui_serverToolTip.html</file>/n/n<file>org_eclipse_wst_server_ui_wizardFragments.html</file></files>
\ No newline at end of file
+<files component="servertools"><file>org_eclipse_jst_server_core_internalRuntimeComponentProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeClasspathProviders.html</file>/n/n<file>org_eclipse_jst_server_core_runtimeFacetMappings.html</file>/n/n<file>org_eclipse_jst_server_core_serverProfilers.html</file>/n/n<file>org_eclipse_wst_server_core_clients.html</file>/n/n<file>org_eclipse_wst_server_core_installableRuntimes.html</file>/n/n<file>org_eclipse_wst_server_core_installableServers.html</file>/n/n<file>org_eclipse_wst_server_core_internalServerMonitors.html</file>/n/n<file>org_eclipse_wst_server_core_internalStartup.html</file>/n/n<file>org_eclipse_wst_server_core_launchableAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleArtifactAdapters.html</file>/n/n<file>org_eclipse_wst_server_core_moduleFactories.html</file>/n/n<file>org_eclipse_wst_server_core_moduleTypes.html</file>/n/n<file>org_eclipse_wst_server_core_publishTasks.html</file>/n/n<file>org_eclipse_wst_server_core_publishers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeFacetComponentProviders.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeLocators.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTargetHandlers.html</file>/n/n<file>org_eclipse_wst_server_core_runtimeTypes.html</file>/n/n<file>org_eclipse_wst_server_core_serverLocators.html</file>/n/n<file>org_eclipse_wst_server_core_serverTypes.html</file>/n/n<file>org_eclipse_wst_server_ui_audio.html</file>/n/n<file>org_eclipse_wst_server_ui_editorActions.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPageSections.html</file>/n/n<file>org_eclipse_wst_server_ui_editorPages.html</file>/n/n<file>org_eclipse_wst_server_ui_initialSelectionProvider.html</file>/n/n<file>org_eclipse_wst_server_ui_serverImages.html</file>/n/n<file>org_eclipse_wst_server_ui_serverToolTip.html</file>/n/n<file>org_eclipse_wst_server_ui_wizardFragments.html</file></files>
\ No newline at end of file
diff --git a/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml b/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml
index 1d69c8f..5228142 100644
--- a/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml
+++ b/docs/org.eclipse.server.doc.isv/topics_ExtPoint_Reference.xml
@@ -30,4 +30,4 @@
 <topic label="org.eclipse.wst.server.ui.serverImages" href="html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverImages.html"/>
 <topic label="org.eclipse.wst.server.ui.serverToolTip" href="html/extpts_reference/servertools/org_eclipse_wst_server_ui_serverToolTip.html"/>
 <topic label="org.eclipse.wst.server.ui.wizardFragments" href="html/extpts_reference/servertools/org_eclipse_wst_server_ui_wizardFragments.html"/>
-</toc>
+</toc>
\ No newline at end of file