diff --git a/org.fortiss.tooling.kernel/trunk/schema/modelElementHandler.exsd b/org.fortiss.tooling.kernel/trunk/schema/modelElementHandler.exsd
index 667ffd97e40091b3dfb9d4f0b0dad3dd66028fab..92b8a5288212d9f613879af0a856a85548b67abe 100644
--- a/org.fortiss.tooling.kernel/trunk/schema/modelElementHandler.exsd
+++ b/org.fortiss.tooling.kernel/trunk/schema/modelElementHandler.exsd
@@ -65,7 +65,7 @@
                   
                </documentation>
                <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.fortiss.tooling.kernel.interfaces.IModelElementHandler"/>
+                  <meta.attribute kind="java" basedOn=":org.fortiss.tooling.kernel.interfaces.IHandler"/>
                </appinfo>
             </annotation>
          </attribute>
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/base/ModelElementHandlerBase.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/base/HandlerBase.java
similarity index 92%
rename from org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/base/ModelElementHandlerBase.java
rename to org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/base/HandlerBase.java
index 607c3601f699ce29b4af26af03c13a9c4d2da4ba..cfd9c1cf9097433ef8abb40c025ba8501d89925d 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/base/ModelElementHandlerBase.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/base/HandlerBase.java
@@ -24,18 +24,18 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.fortiss.tooling.kernel.ToolingKernelActivator;
-import org.fortiss.tooling.kernel.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.interfaces.IHandler;
 
 /**
- * Base implementation for {@link IModelElementHandler}s.
+ * Base implementation for {@link IHandler}s.
  * 
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
  * @levd.rating RED Rev:
  */
-public abstract class ModelElementHandlerBase<T extends EObject> implements
-		IModelElementHandler<T> {
+public abstract class HandlerBase<T extends EObject> implements
+		IHandler<T> {
 
 	/** Stores the singleton of the icon image. */
 	private Image iconImage;
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IModelElementHandler.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IHandler.java
similarity index 97%
rename from org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IModelElementHandler.java
rename to org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IHandler.java
index 9f498869e1f9f3b0fb0f9ec04dacc61363ecc81e..b4e5153570cb8ee523b0fe5dd7b04b60d951627f 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IModelElementHandler.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IHandler.java
@@ -32,7 +32,7 @@ import org.eclipse.swt.graphics.Image;
  * @version $Rev$
  * @levd.rating RED Rev:
  */
-public interface IModelElementHandler<T extends EObject> {
+public interface IHandler<T extends EObject> {
 
 	/** Returns the name of the model element (if any). */
 	String getName(T element);
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ModelElementService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ModelElementService.java
index 220873fe83c6040840e5971facbd47223f62955c..a09199898f8f4495e7fa867444adefe5c26f4ad6 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ModelElementService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ModelElementService.java
@@ -26,7 +26,7 @@ import org.conqat.lib.commons.reflect.ReflectionUtils;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.emf.ecore.EObject;
 import org.fortiss.tooling.kernel.ToolingKernelActivator;
-import org.fortiss.tooling.kernel.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.interfaces.IHandler;
 import org.fortiss.tooling.kernel.services.IModelElementService;
 import org.osgi.framework.Bundle;
 
@@ -47,7 +47,7 @@ public class ModelElementService implements IModelElementService {
 	private static final String CONFIGURATION_ELEMENT_NAME = "modelElementHandler";
 
 	/** Stores the model element handler for each model element class. */
-	private Map<Class<?>, IModelElementHandler<EObject>> handlerMap;
+	private Map<Class<?>, IHandler<EObject>> handlerMap;
 
 	/** Constructor. */
 	public ModelElementService() {
@@ -57,7 +57,7 @@ public class ModelElementService implements IModelElementService {
 	/** Initializes the handler map from plugin extensions. */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private void setupHandlerMap() {
-		handlerMap = new HashMap<Class<?>, IModelElementHandler<EObject>>();
+		handlerMap = new HashMap<Class<?>, IHandler<EObject>>();
 		for (IConfigurationElement ce : ExtensionPointUtils
 				.getConfigurationElements(EXTENSION_POINT_NAME,
 						CONFIGURATION_ELEMENT_NAME)) {
@@ -67,7 +67,7 @@ public class ModelElementService implements IModelElementService {
 						ce.getAttribute("modelElementClass"), bundle);
 				Class<?> handlerClass = ExtensionPointUtils.loadClass(
 						ce.getAttribute("handler"), bundle);
-				IModelElementHandler<EObject> handler = (IModelElementHandler) handlerClass
+				IHandler<EObject> handler = (IHandler) handlerClass
 						.getConstructor().newInstance();
 				handlerMap.put(modelElementClass, handler);
 			} catch (Exception ex) {
@@ -79,10 +79,10 @@ public class ModelElementService implements IModelElementService {
 
 	/** {@inheritDoc} */
 	@Override
-	public IModelElementHandler<EObject> getModelElementHandler(
+	public IHandler<EObject> getModelElementHandler(
 			EObject modelElement) {
 		Class<? extends EObject> clazz = modelElement.getClass();
-		IModelElementHandler<EObject> handler = handlerMap.get(clazz);
+		IHandler<EObject> handler = handlerMap.get(clazz);
 		if (handler == null) {
 			handler = ReflectionUtils.performNearestClassLookup(clazz,
 					handlerMap);
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/handler/ProjectSpaceModelElementHandler.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/handler/ProjectSpaceModelElementHandler.java
index 446b25f8463e89a3958047a9f9d98fc48252c900..4261cbcadd8d03d23ac579a2c15c4083ae34493d 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/handler/ProjectSpaceModelElementHandler.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/handler/ProjectSpaceModelElementHandler.java
@@ -23,13 +23,13 @@ import java.util.List;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.fortiss.tooling.kernel.ToolingKernelActivator;
-import org.fortiss.tooling.kernel.base.ModelElementHandlerBase;
-import org.fortiss.tooling.kernel.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.base.HandlerBase;
+import org.fortiss.tooling.kernel.interfaces.IHandler;
 import org.fortiss.tooling.kernel.model.IProjectRootElement;
 import org.unicase.workspace.ProjectSpace;
 
 /**
- * {@link IModelElementHandler} for {@link ProjectSpace}s.
+ * {@link IHandler} for {@link ProjectSpace}s.
  * 
  * @author hoelzlf
  * @author $Author$
@@ -37,7 +37,7 @@ import org.unicase.workspace.ProjectSpace;
  * @levd.rating RED Rev:
  */
 public final class ProjectSpaceModelElementHandler extends
-		ModelElementHandlerBase<ProjectSpace> {
+		HandlerBase<ProjectSpace> {
 
 	/** {@inheritDoc} */
 	@Override
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java
index cd166b31719704f21137c08b98b176ede0cad7b5..b65c8c64c306ae0afe7718b542f9de3a49e9106f 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeContentProvider.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
-import org.fortiss.tooling.kernel.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.interfaces.IHandler;
 import org.fortiss.tooling.kernel.services.IModelElementService;
 import org.unicase.ecp.model.workSpaceModel.ECPProject;
 import org.unicase.ecp.model.workSpaceModel.ECPWorkspace;
@@ -57,7 +57,7 @@ public class NavigatorTreeContentProvider implements ITreeContentProvider {
 	@Override
 	public Object[] getChildren(Object parentElement) {
 		if (parentElement instanceof EObject) {
-			IModelElementHandler<EObject> handler = IModelElementService.INSTANCE
+			IHandler<EObject> handler = IModelElementService.INSTANCE
 					.getModelElementHandler((EObject) parentElement);
 			if (handler != null) {
 				return handler.getSubnodes((EObject) parentElement).toArray();
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeLabelProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeLabelProvider.java
index 5e25afe7d889eee2eaacc20cb570877ea5e402e4..0a3eede08917bc700bf2563283c527c52eb2285f 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeLabelProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/navigator/NavigatorTreeLabelProvider.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.BaseLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.swt.graphics.Image;
-import org.fortiss.tooling.kernel.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.interfaces.IHandler;
 import org.fortiss.tooling.kernel.services.IModelElementService;
 
 /**
@@ -39,7 +39,7 @@ public final class NavigatorTreeLabelProvider extends BaseLabelProvider
 	@Override
 	public Image getImage(Object element) {
 		if (element instanceof EObject) {
-			IModelElementHandler<EObject> handler = IModelElementService.INSTANCE
+			IHandler<EObject> handler = IModelElementService.INSTANCE
 					.getModelElementHandler((EObject) element);
 			if (handler != null) {
 				return handler.getIcon();
@@ -52,7 +52,7 @@ public final class NavigatorTreeLabelProvider extends BaseLabelProvider
 	@Override
 	public String getText(Object element) {
 		if (element instanceof EObject) {
-			IModelElementHandler<EObject> handler = IModelElementService.INSTANCE
+			IHandler<EObject> handler = IModelElementService.INSTANCE
 					.getModelElementHandler((EObject) element);
 			if (handler != null) {
 				return handler.getName((EObject) element);
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/services/IModelElementService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/services/IModelElementService.java
index 5af9ac0d5b1f94d9e86e010b052948f6114d70a3..b39a9a06f9959657c614a28bf6d9c789c2ecf968 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/services/IModelElementService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/services/IModelElementService.java
@@ -18,7 +18,7 @@ $Id$
 package org.fortiss.tooling.kernel.services;
 
 import org.eclipse.emf.ecore.EObject;
-import org.fortiss.tooling.kernel.interfaces.IModelElementHandler;
+import org.fortiss.tooling.kernel.interfaces.IHandler;
 import org.fortiss.tooling.kernel.internal.ModelElementService;
 
 /**
@@ -36,5 +36,5 @@ public interface IModelElementService {
 	public static final IModelElementService INSTANCE = new ModelElementService();
 
 	/** Returns the model element handler for the given model element. */
-	IModelElementHandler<EObject> getModelElementHandler(EObject modelElement);
+	IHandler<EObject> getModelElementHandler(EObject modelElement);
 }