[97097] removed remaining occurrences of "com.ibm"
diff --git a/bundles/org.eclipse.wst.dtd.core/emfmodel/rose/DTD.cat b/bundles/org.eclipse.wst.dtd.core/emfmodel/rose/DTD.cat
index 36996e0..4097274 100644
--- a/bundles/org.eclipse.wst.dtd.core/emfmodel/rose/DTD.cat
+++ b/bundles/org.eclipse.wst.dtd.core/emfmodel/rose/DTD.cat
@@ -19,7 +19,7 @@
 	(object Attribute

 	    tool       	"Ecore"

 	    name       	"basePackage"

-	    value      	(value Text "com.ibm.etools"))

+	    value      	(value Text "org.eclipse.wst.dtd"))

 	(object Attribute

 	    tool       	"Ecore"

 	    name       	"prefix"

diff --git a/bundles/org.eclipse.wst.xsd.ui/plugin.xml b/bundles/org.eclipse.wst.xsd.ui/plugin.xml
index 5ccd5b5..7b9bf5b 100644
--- a/bundles/org.eclipse.wst.xsd.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xsd.ui/plugin.xml
@@ -107,38 +107,38 @@
 			<propertyTab
 				label="%_UI_LABEL_GENERAL"
 				category="general"
-				id="com.ibm.xmlwebservices.general">
+				id="org.eclipse.wst.xmlwebservices.general">
 			</propertyTab>
 			<propertyTab
 				label="%_UI_LABEL_NAMESPACE"
 				category="namespace"
-				afterTab="com.ibm.xmlwebservices.general"
-				id="com.ibm.xmlwebservices.namespace">
+				afterTab="org.eclipse.wst.xmlwebservices.general"
+				id="org.eclipse.wst.xmlwebservices.namespace">
 			</propertyTab>
 			<propertyTab
 				label="%_UI_LABEL_OTHER"
 				category="other"
-				id="com.ibm.xmlwebservices.other">
+				id="org.eclipse.wst.xmlwebservices.other">
 			</propertyTab>
 			<propertyTab
 				label="%_UI_LABEL_ATTRIBUTES"
 				category="attributes"
-				id="com.ibm.xmlwebservices.attributes">
+				id="org.eclipse.wst.xmlwebservices.attributes">
 			</propertyTab>
 			<propertyTab
 				label="%_UI_LABEL_ENUMERATIONS"
 				category="enumerations"
-				id="com.ibm.xmlwebservices.enumerations">
+				id="org.eclipse.wst.xmlwebservices.enumerations">
 			</propertyTab>
 			<propertyTab
 				label="%_UI_LABEL_DOCUMENTATION"
 				category="documentation"
-				id="com.ibm.xmlwebservices.documentation">
+				id="org.eclipse.wst.xmlwebservices.documentation">
 			</propertyTab>
 			<propertyTab
 				label="%_UI_SECTION_ADVANCED_ATTRIBUTES"
 				category="facets"
-				id="com.ibm.xmlwebservices.facets">
+				id="org.eclipse.wst.xmlwebservices.facets">
 			</propertyTab>
 		</propertyTabs>
 	</extension>
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AnnotationSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AnnotationSectionDescriptor.java
index cea5b1e..93bd523 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AnnotationSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AnnotationSectionDescriptor.java
@@ -47,7 +47,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.annotation";
+    return "org.eclipse.wst.xsdeditor.section.annotation";
   }
 
   /* (non-Javadoc)
@@ -73,7 +73,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.documentation";
+    return "org.eclipse.wst.xmlwebservices.documentation";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AttributesViewSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AttributesViewSectionDescriptor.java
index 8136767..2156ff9 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AttributesViewSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/AttributesViewSectionDescriptor.java
@@ -35,7 +35,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.attributes";
+    return "org.eclipse.wst.xsdeditor.section.attributes";
   }
 
   /* (non-Javadoc)
@@ -87,7 +87,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.attributes";
+    return "org.eclipse.wst.xmlwebservices.attributes";
   }
   
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ComplexTypeSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ComplexTypeSectionDescriptor.java
index 8185edb..56979a7 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ComplexTypeSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ComplexTypeSectionDescriptor.java
@@ -53,7 +53,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
 
   /* (non-Javadoc)
@@ -76,7 +76,7 @@
   
   public String getAfterSection()
   {
-    return "com.ibm.xsdeditor.section.name";
+    return "org.eclipse.wst.xsdeditor.section.name";
   }
 
 }
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/EnumerationsSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/EnumerationsSectionDescriptor.java
index 8d8e26b..0af99b0 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/EnumerationsSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/EnumerationsSectionDescriptor.java
@@ -36,7 +36,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.enumerations";
+    return "org.eclipse.wst.xsdeditor.section.enumerations";
   }
 
   /* (non-Javadoc)
@@ -62,7 +62,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.enumerations";
+    return "org.eclipse.wst.xmlwebservices.enumerations";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/FacetsSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/FacetsSectionDescriptor.java
index acd25e7..c188f7c 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/FacetsSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/FacetsSectionDescriptor.java
@@ -36,7 +36,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.facets";
+    return "org.eclipse.wst.xsdeditor.section.facets";
   }
 
   /* (non-Javadoc)
@@ -62,7 +62,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.facets";
+    return "org.eclipse.wst.xmlwebservices.facets";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/MinMaxSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/MinMaxSectionDescriptor.java
index a73f2ab..b82b234 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/MinMaxSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/MinMaxSectionDescriptor.java
@@ -38,7 +38,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.minmax";
+    return "org.eclipse.wst.xsdeditor.section.minmax";
   }
 
   /* (non-Javadoc)
@@ -66,7 +66,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ModelGroupSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ModelGroupSectionDescriptor.java
index f4d8188..e311366 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ModelGroupSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ModelGroupSectionDescriptor.java
@@ -34,7 +34,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.modelgroup";
+    return "org.eclipse.wst.xsdeditor.section.modelgroup";
   }
 
   /* (non-Javadoc)
@@ -60,7 +60,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NameSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NameSectionDescriptor.java
index d0169a8..dadc81d 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NameSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NameSectionDescriptor.java
@@ -40,7 +40,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.name";
+    return "org.eclipse.wst.xsdeditor.section.name";
   }
 
   /* (non-Javadoc)
@@ -67,7 +67,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceAndSchemaLocationDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceAndSchemaLocationDescriptor.java
index 11a1a4a..f86fe2d 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceAndSchemaLocationDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceAndSchemaLocationDescriptor.java
@@ -37,7 +37,7 @@
 	   */
 	  public String getId()
 	  {
-	    return "com.ibm.xsdeditor.section.namespaceAndSchemaLocationSection";
+	    return "org.eclipse.wst.xsdeditor.section.namespaceAndSchemaLocationSection";
 	  }
 
 	  /* (non-Javadoc)
@@ -63,7 +63,7 @@
 	   */
 	  public String getTargetTab()
 	  {
-	    return "com.ibm.xmlwebservices.general";
+	    return "org.eclipse.wst.xmlwebservices.general";
 	  }
 
 	  /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceProcessContentsSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceProcessContentsSectionDescriptor.java
index 7df7295..87608c9 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceProcessContentsSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceProcessContentsSectionDescriptor.java
@@ -34,7 +34,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.namespaceprocesscontents";
+    return "org.eclipse.wst.xsdeditor.section.namespaceprocesscontents";
   }
 
   /* (non-Javadoc)
@@ -60,7 +60,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceSectionDescriptor.java
index 20496c9..69f2d15 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/NamespaceSectionDescriptor.java
@@ -37,7 +37,7 @@
 	   */
 	  public String getId()
 	  {
-	    return "com.ibm.xsdeditor.section.namespaceSection";
+	    return "org.eclipse.wst.xsdeditor.section.namespaceSection";
 	  }
 
 	  /* (non-Javadoc)
@@ -63,7 +63,7 @@
 	   */
 	  public String getTargetTab()
 	  {
-	    return "com.ibm.xmlwebservices.general";
+	    return "org.eclipse.wst.xmlwebservices.general";
 	  }
 
 	  /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/OtherAttributesSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/OtherAttributesSectionDescriptor.java
index 47bc238..5bc984f 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/OtherAttributesSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/OtherAttributesSectionDescriptor.java
@@ -50,7 +50,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.otherattributes";
+    return "org.eclipse.wst.xsdeditor.section.otherattributes";
   }
 
   /* (non-Javadoc)
@@ -76,7 +76,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.other";
+    return "org.eclipse.wst.xmlwebservices.other";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/PatternSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/PatternSectionDescriptor.java
index c67f332..68219c7 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/PatternSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/PatternSectionDescriptor.java
@@ -35,7 +35,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.pattern";
+    return "org.eclipse.wst.xsdeditor.section.pattern";
   }
 
   /* (non-Javadoc)
@@ -61,7 +61,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ReferenceSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ReferenceSectionDescriptor.java
index 47fd89a..b512114 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ReferenceSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ReferenceSectionDescriptor.java
@@ -79,7 +79,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SchemaLocationDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SchemaLocationDescriptor.java
index 936e5b3..ca2200d 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SchemaLocationDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SchemaLocationDescriptor.java
@@ -37,7 +37,7 @@
 	   */
 	  public String getId()
 	  {
-	    return "com.ibm.xsdeditor.section.schemaLocationSection";
+	    return "org.eclipse.wst.xsdeditor.section.schemaLocationSection";
 	  }
 
 	  /* (non-Javadoc)
@@ -63,7 +63,7 @@
 	   */
 	  public String getTargetTab()
 	  {
-	    return "com.ibm.xmlwebservices.general";
+	    return "org.eclipse.wst.xmlwebservices.general";
 	  }
 
 	  /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SimpleTypeSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SimpleTypeSectionDescriptor.java
index a202f58..bd02dee 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SimpleTypeSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SimpleTypeSectionDescriptor.java
@@ -36,7 +36,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.simpletype";
+    return "org.eclipse.wst.xsdeditor.section.simpletype";
   }
 
   /* (non-Javadoc)
@@ -62,12 +62,12 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
   
   public String getAfterSection()
   {
-    return "com.ibm.xsdeditor.section.name";
+    return "org.eclipse.wst.xsdeditor.section.name";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SimpleTypeUnionSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SimpleTypeUnionSectionDescriptor.java
index a7256a7..00215ec 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SimpleTypeUnionSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/SimpleTypeUnionSectionDescriptor.java
@@ -33,7 +33,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.simpletypeunion";
+    return "org.eclipse.wst.xsdeditor.section.simpletypeunion";
   }
 
   /* (non-Javadoc)
@@ -59,7 +59,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/TypesSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/TypesSectionDescriptor.java
index 38ccbe1..98458b4 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/TypesSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/TypesSectionDescriptor.java
@@ -40,7 +40,7 @@
    */
   public String getId()
   {
-    return "com.ibm.xsdeditor.section.types";
+    return "org.eclipse.wst.xsdeditor.section.types";
   }
 
   /* (non-Javadoc)
@@ -69,7 +69,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
 
   /* (non-Javadoc)
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ValueSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ValueSectionDescriptor.java
index cd9e21d..e8f0b48 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ValueSectionDescriptor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/properties/section/ValueSectionDescriptor.java
@@ -52,7 +52,7 @@
    */
   public String getTargetTab()
   {
-    return "com.ibm.xmlwebservices.general";
+    return "org.eclipse.wst.xmlwebservices.general";
   }
 
   /* (non-Javadoc)
@@ -75,7 +75,7 @@
   
   public String getAfterSection()
   {
-    return "com.ibm.xsdeditor.section.name";
+    return "org.eclipse.wst.xsdeditor.section.name";
   }
 
 
diff --git a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
index 079b727..4d1c2d0 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
@@ -67,7 +67,7 @@
 
 	
 	/* (non-Javadoc)
-	 * @see com.ibm.xsd.internal.refactoring.rename.XSDRenameProcessor#getAffectedProjectNatures()
+	 * @see org.eclipse.wst.xsd.internal.refactoring.rename.XSDRenameProcessor#getAffectedProjectNatures()
 	 */
 	protected String[] getAffectedProjectNatures() throws CoreException {
 		//TODO: find project natures of the files that are going to be refactored
@@ -75,7 +75,7 @@
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.ibm.xsd.internal.refactoring.rename.XSDRenameProcessor#loadDerivedParticipants(org.eclipse.ltk.core.refactoring.RefactoringStatus, java.util.List, java.lang.String[], org.eclipse.ltk.core.refactoring.participants.SharableParticipants)
+	 * @see org.eclipse.wst.xsd.internal.refactoring.rename.XSDRenameProcessor#loadDerivedParticipants(org.eclipse.ltk.core.refactoring.RefactoringStatus, java.util.List, java.lang.String[], org.eclipse.ltk.core.refactoring.participants.SharableParticipants)
 	 */
 	protected void loadDerivedParticipants(RefactoringStatus status,
 			List result, String[] natures, SharableParticipants shared)