diff --git a/framework/src/main/java/org/apache/felix/moduleloader/IModuleDefinition.java b/framework/src/main/java/org/apache/felix/moduleloader/IModuleDefinition.java
index 230f7d1..1c50e67 100644
--- a/framework/src/main/java/org/apache/felix/moduleloader/IModuleDefinition.java
+++ b/framework/src/main/java/org/apache/felix/moduleloader/IModuleDefinition.java
@@ -18,14 +18,12 @@
  */
 package org.apache.felix.moduleloader;
 
-import org.apache.felix.framework.util.manifestparser.R4Import;
-import org.apache.felix.framework.util.manifestparser.R4Export;
 import org.apache.felix.framework.util.manifestparser.R4Library;
 
 public interface IModuleDefinition
 {
-    public R4Export[] getExports();
-    public R4Import[] getImports();
-    public R4Import[] getDynamicImports();
+    public ICapability[] getCapabilities();
+    public IRequirement[] getRequirements();
+    public IRequirement[] getDynamicRequirements();
     public R4Library[] getLibraries();
 }
\ No newline at end of file
diff --git a/framework/src/main/java/org/apache/felix/moduleloader/IWire.java b/framework/src/main/java/org/apache/felix/moduleloader/IWire.java
index 6fea614..d372733 100644
--- a/framework/src/main/java/org/apache/felix/moduleloader/IWire.java
+++ b/framework/src/main/java/org/apache/felix/moduleloader/IWire.java
@@ -21,13 +21,11 @@
 import java.net.URL;
 import java.util.Enumeration;
 
-import org.apache.felix.framework.util.manifestparser.R4Export;
-
 public interface IWire
 {
     public IModule getImporter();
     public IModule getExporter();
-    public R4Export getExport();
+    public ICapability getCapability();
     public Class getClass(String name) throws ClassNotFoundException;
     public URL getResource(String name) throws ResourceNotFoundException;
     public Enumeration getResources(String name) throws ResourceNotFoundException;