diff --git a/bundles/org.eclipse.wst.xsd.ui/plugin.properties b/bundles/org.eclipse.wst.xsd.ui/plugin.properties
index 3f52649..12f2f12 100644
--- a/bundles/org.eclipse.wst.xsd.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.xsd.ui/plugin.properties
@@ -809,9 +809,10 @@
 command.xsd.refactor.renameTargetNamespace.name=Rename Target Namespace
 command.xsd.refactor.renameTargetNamespace.description=Changes the target namespace of the schema
 xsd.resource.rename.participant.name=Rename XSD Component
-ExtensionsSchemasDescription=This extension point is derecated, use extensionCategories
+ExtensionsSchemasDescription=This extension point is deprecated, use extensionCategories
 ExtensionCategoriesDescription=Extension point for contributing to the 'built in' categories of extension elements for XML Schema
-XSDEditorExtensionConfiguration=Extension point for extending the XML Schema Editor
+XSDEditorExtensionConfiguration=This extension point is deprecated, use internalEditorConfiguration
+InternalEditorConfiguration=Extension point for extending the XML Schema Editor
 
 ! Copied from sse
 23concat_EXC_=Resource {0} does not exist.
diff --git a/bundles/org.eclipse.wst.xsd.ui/plugin.xml b/bundles/org.eclipse.wst.xsd.ui/plugin.xml
index fe6294c..a816366 100644
--- a/bundles/org.eclipse.wst.xsd.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.xsd.ui/plugin.xml
@@ -223,8 +223,10 @@
   <!-- this extension point is deprecated, use extensionCategories -->
   <extension-point id="ExtensionsSchemasDescription" name="%ExtensionsSchemasDescription"/>  
   <extension-point id="extensionCategories" name="%ExtensionCategoriesDescription"/>
-  
+
+  <!-- this extension point is deprecated, use internalEditorConfiguration -->  
   <extension-point id="XSDEditorExtensionConfiguration" name="%XSDEditorExtensionConfiguration"/>
+  <extension-point id="internalEditorConfiguration" name="%InternalEditorConfiguration"/>
   
   <extension-point id="extensibilityNodeCustomizations" name="%ExtensionNodeCustomizationsDescription"/>
   
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorConfiguration.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorConfiguration.java
index 216dcc7..89e5800 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorConfiguration.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorConfiguration.java
@@ -24,6 +24,7 @@
 public class XSDEditorConfiguration
 {
   public static final String XSDEDITORCONFIGURATIONEXTENSIONID = "org.eclipse.wst.xsd.ui.XSDEditorExtensionConfiguration"; //$NON-NLS-1$
+  public static final String INTERNALEDITORCONFIGURATION_EXTENSIONID = "org.eclipse.wst.xsd.ui.internalEditorConfiguration"; //$NON-NLS-1$
   public static final String CLASSNAME = "class"; //$NON-NLS-1$
   public static final String ADAPTERFACTORY = "adapterFactory"; //$NON-NLS-1$
   public static final String TOOLBARACTION = "toolbarAction"; //$NON-NLS-1$
@@ -109,19 +110,24 @@
 
   public void readXSDConfigurationRegistry()
   {
-    IConfigurationElement[] xsdEditorExtensionList = Platform.getExtensionRegistry().getConfigurationElementsFor(XSDEDITORCONFIGURATIONEXTENSIONID);
-
-    boolean definedExtensionsExist = (xsdEditorExtensionList != null && xsdEditorExtensionList.length > 0);
-
     definedExtensionsList = new ArrayList();
-
+    updateList(INTERNALEDITORCONFIGURATION_EXTENSIONID);
+    updateList(XSDEDITORCONFIGURATIONEXTENSIONID);
+  }
+  
+  private void updateList(String ID)
+  {
+    IConfigurationElement[] xsdEditorExtensionList = Platform.getExtensionRegistry().getConfigurationElementsFor(ID);
+    boolean definedExtensionsExist = (xsdEditorExtensionList != null && xsdEditorExtensionList.length > 0);
+    
     if (definedExtensionsExist)
     {
+
       for (int i = 0; i < xsdEditorExtensionList.length; i++)
       {
         XSDEditorExtensionProperties properties = new XSDEditorExtensionProperties();
         definedExtensionsList.add(properties);
-
+  
         IConfigurationElement element = xsdEditorExtensionList[i];
         String adapterFactoryClass = element.getAttribute(ADAPTERFACTORY);
         if (adapterFactoryClass != null)
@@ -134,7 +140,7 @@
             properties.setAdapterFactory(adapterFactory);
           }
         }
-
+  
         String figureFactoryClass = element.getAttribute(FIGUREFACTORY);
         if (figureFactoryClass != null)
         {
@@ -146,7 +152,7 @@
             properties.setFigureFactoryList(figureFactory);
           }
         }
-
+  
         IConfigurationElement[] toolbarActions = element.getChildren(TOOLBARACTION);
         List actionList = new ArrayList();
         if (toolbarActions != null)
@@ -168,7 +174,7 @@
           }
         }
         properties.setActionList(actionList);
-
+  
         String editPartFactoryClass = element.getAttribute(EDITPARTFACTORY);
         if (editPartFactoryClass != null)
         {
@@ -180,7 +186,6 @@
             properties.setEditPartFactoryList(editPartFactory);
           }
         }
-
       }
     }
   }
