diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src/org/eclipse/qvtd/xtext/qvtcore/ui/QVTcoreEditor.java b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src/org/eclipse/qvtd/xtext/qvtcore/ui/QVTcoreEditor.java
index c036177..809b828 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src/org/eclipse/qvtd/xtext/qvtcore/ui/QVTcoreEditor.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcore.ui/src/org/eclipse/qvtd/xtext/qvtcore/ui/QVTcoreEditor.java
@@ -10,10 +10,10 @@
  */
 package org.eclipse.qvtd.xtext.qvtcore.ui;
 
+import org.eclipse.ocl.xtext.base.ui.BaseEditor;
 import org.eclipse.qvtd.xtext.qvtcore.ui.internal.QVTcoreActivator;
-import org.eclipse.xtext.ui.editor.XtextEditor;
 
-public class QVTcoreEditor extends XtextEditor
+public class QVTcoreEditor extends BaseEditor
 {
 	public static final String EDITOR_ID = QVTcoreActivator.ORG_ECLIPSE_QVTD_XTEXT_QVTCORE_QVTCORE;
 
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/src/org/eclipse/qvtd/xtext/qvtcorebase/ui/QVTcoreBaseEditor.java b/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/src/org/eclipse/qvtd/xtext/qvtcorebase/ui/QVTcoreBaseEditor.java
index a2c0aaf..57a90a7 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/src/org/eclipse/qvtd/xtext/qvtcorebase/ui/QVTcoreBaseEditor.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtcorebase.ui/src/org/eclipse/qvtd/xtext/qvtcorebase/ui/QVTcoreBaseEditor.java
@@ -10,10 +10,10 @@
  */
 package org.eclipse.qvtd.xtext.qvtcorebase.ui;
 
+import org.eclipse.ocl.xtext.base.ui.BaseEditor;
 import org.eclipse.qvtd.xtext.qvtcorebase.ui.internal.QVTcoreBaseActivator;
-import org.eclipse.xtext.ui.editor.XtextEditor;
 
-public class QVTcoreBaseEditor extends XtextEditor
+public class QVTcoreBaseEditor extends BaseEditor
 {
 	public static final String EDITOR_ID = QVTcoreBaseActivator.ORG_ECLIPSE_QVTD_XTEXT_QVTCOREBASE_QVTCOREBASE;
 
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src/org/eclipse/qvtd/xtext/qvtimperative/ui/QVTimperativeEditor.java b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src/org/eclipse/qvtd/xtext/qvtimperative/ui/QVTimperativeEditor.java
index ae1dd27..1794010 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src/org/eclipse/qvtd/xtext/qvtimperative/ui/QVTimperativeEditor.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtimperative.ui/src/org/eclipse/qvtd/xtext/qvtimperative/ui/QVTimperativeEditor.java
@@ -10,10 +10,10 @@
  *******************************************************************************/
 package org.eclipse.qvtd.xtext.qvtimperative.ui;
 
+import org.eclipse.ocl.xtext.base.ui.BaseEditor;
 import org.eclipse.qvtd.xtext.qvtimperative.ui.internal.QVTimperativeActivator;
-import org.eclipse.xtext.ui.editor.XtextEditor;
 
-public class QVTimperativeEditor extends XtextEditor
+public class QVTimperativeEditor extends BaseEditor
 {
 	public static final String EDITOR_ID = QVTimperativeActivator.ORG_ECLIPSE_QVTD_XTEXT_QVTIMPERATIVE_QVTIMPERATIVE;
 
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src/org/eclipse/qvtd/xtext/qvtrelation/ui/QVTrelationEditor.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src/org/eclipse/qvtd/xtext/qvtrelation/ui/QVTrelationEditor.java
index cac226f..6d2c49d 100644
--- a/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src/org/eclipse/qvtd/xtext/qvtrelation/ui/QVTrelationEditor.java
+++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation.ui/src/org/eclipse/qvtd/xtext/qvtrelation/ui/QVTrelationEditor.java
@@ -10,10 +10,10 @@
  */
 package org.eclipse.qvtd.xtext.qvtrelation.ui;
 
+import org.eclipse.ocl.xtext.base.ui.BaseEditor;
 import org.eclipse.qvtd.xtext.qvtrelation.ui.internal.QVTrelationActivator;
-import org.eclipse.xtext.ui.editor.XtextEditor;
 
-public class QVTrelationEditor extends XtextEditor
+public class QVTrelationEditor extends BaseEditor
 {
 	public static final String EDITOR_ID = QVTrelationActivator.ORG_ECLIPSE_QVTD_XTEXT_QVTRELATION_QVTRELATION;