diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java
index 224e8a6..d924696 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java
@@ -101,7 +101,7 @@
   protected Composite toolbar;
   protected ModeComboListener modeComboListener;
   protected int maxLength = 0;
-  protected ActivationListener fActivationListener;
+  protected CommonActivationListener fActivationListener;
   
   public CommonMultiPageEditor()
   {
@@ -395,7 +395,7 @@
     }
     setPartName(title);
     
-    fActivationListener = new ActivationListener(site.getWorkbenchWindow().getPartService());
+    fActivationListener = new CommonActivationListener(site.getWorkbenchWindow().getPartService());
   }
 
   protected void initializeActionRegistry()
@@ -731,7 +731,7 @@
   }
   
   
-  protected class ActivationListener implements IPartListener, IWindowListener
+  protected class CommonActivationListener implements IPartListener, IWindowListener
   {
 
     /** Cache of the active workbench part. */
@@ -752,7 +752,7 @@
      *          the part service on which to add the part listener
      * @since 3.1
      */
-    public ActivationListener(IPartService partService)
+    public CommonActivationListener(IPartService partService)
     {
       fPartService = partService;
       fPartService.addPartListener(this);
