Replace ITeam with Team -> aspectBinding for a team interface is useless
diff --git a/plugins/org.eclipse.objectteams.osgi.weaving/schema/aspectBindings.exsd b/plugins/org.eclipse.objectteams.osgi.weaving/schema/aspectBindings.exsd
index 7ed4fb7..6a1c4e8 100644
--- a/plugins/org.eclipse.objectteams.osgi.weaving/schema/aspectBindings.exsd
+++ b/plugins/org.eclipse.objectteams.osgi.weaving/schema/aspectBindings.exsd
@@ -143,7 +143,7 @@
                   Fully qualified name of a team class.
                </documentation>
                <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.objectteams.ITeam"/>
+                  <meta.attribute kind="java" basedOn="org.objectteams.Team"/>
                </appInfo>
             </annotation>
          </attribute>
@@ -153,7 +153,7 @@
                   Fully qualified name of the team&apos;s super-class if that is not org.objectteams.Team but another team of the same plugin.
                </documentation>
                <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.objectteams.ITeam"/>
+                  <meta.attribute kind="java" basedOn="org.objectteams.Team"/>
                </appInfo>
             </annotation>
          </attribute>
diff --git a/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBindingRegistry.java b/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBindingRegistry.java
index b06206e..6b6e40c 100644
--- a/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBindingRegistry.java
+++ b/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/internal/osgi/weaving/AspectBindingRegistry.java
@@ -42,7 +42,7 @@
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.objectteams.otequinox.Constants;
 import org.eclipse.objectteams.otequinox.hook.ILogger;
-import org.objectteams.ITeam;
+import org.objectteams.Team;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.hooks.weaving.WovenClass;
 
@@ -83,17 +83,17 @@
 
 	/** Record for one team waiting for instantiation/activation. */
 	static class WaitingTeamRecord {
-		@Nullable Class<? extends ITeam> teamClass; // ... either this is set
-		@Nullable ITeam teamInstance;	// ... or this
+		@Nullable Class<? extends Team> teamClass; // ... either this is set
+		@Nullable Team teamInstance;	// ... or this
 		AspectBinding aspectBinding;
 		String notFoundClass;
 		
-		public WaitingTeamRecord(Class<? extends ITeam> teamClass, AspectBinding aspectBinding, String notFoundClass) {
+		public WaitingTeamRecord(Class<? extends Team> teamClass, AspectBinding aspectBinding, String notFoundClass) {
 			this.teamClass = teamClass;
 			this.aspectBinding = aspectBinding;
 			this.notFoundClass = notFoundClass;
 		}
-		public WaitingTeamRecord(ITeam teamInstance, AspectBinding aspectBinding, String notFoundClass) {
+		public WaitingTeamRecord(Team teamInstance, AspectBinding aspectBinding, String notFoundClass) {
 			this.teamInstance = teamInstance;
 			this.aspectBinding = aspectBinding;
 			this.notFoundClass = notFoundClass;
@@ -105,11 +105,11 @@
 			this.notFoundClass = notFoundClass;
 		}
 		public @Nullable String getTeamName() {
-			final Class<? extends ITeam> clazz = teamClass;
+			final Class<? extends Team> clazz = teamClass;
 			if (clazz != null) {
 				return clazz.getName();
 			} else {
-				final ITeam instance = teamInstance;
+				final Team instance = teamInstance;
 				if (instance != null)
 					return instance.getClass().getName();
 			}
diff --git a/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/internal/osgi/weaving/TeamLoader.java b/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/internal/osgi/weaving/TeamLoader.java
index bb840e9..99ef94a 100644
--- a/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/internal/osgi/weaving/TeamLoader.java
+++ b/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/internal/osgi/weaving/TeamLoader.java
@@ -29,7 +29,6 @@
 import org.eclipse.objectteams.otequinox.ActivationKind;
 import org.eclipse.objectteams.otequinox.TransformerPlugin;
 import org.eclipse.objectteams.otequinox.hook.ILogger;
-import org.objectteams.ITeam;
 import org.objectteams.Team;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.hooks.weaving.WovenClass;
@@ -78,7 +77,7 @@
 			imports.add(packageOfTeam);
 			log(IStatus.INFO, "Added dependency from base "+baseClass.getClassName()+" to package '"+packageOfTeam+"'");
 			// Load:
-			Class<? extends ITeam> teamClass;
+			Class<? extends Team> teamClass;
 			teamClass = findTeamClass(teamForBase, aspectBundle);
 			if (teamClass == null) {
 				log(new ClassNotFoundException("Not found: "+teamForBase), "Failed to load team "+teamForBase);
@@ -88,7 +87,7 @@
 			ActivationKind activationKind = aspectBinding.getActivation(teamForBase);
 			if (activationKind == ActivationKind.NONE)
 				continue;
-			ITeam teamInstance = instantiateTeam(aspectBinding, teamClass, teamForBase);
+			Team teamInstance = instantiateTeam(aspectBinding, teamClass, teamForBase);
 			if (teamInstance == null)
 				continue;
 			// Activate?
@@ -101,7 +100,7 @@
 	public void instantiateWaitingTeam(WaitingTeamRecord record)
 			throws InstantiationException, IllegalAccessException 
 	{
-		ITeam teamInstance = record.teamInstance;
+		Team teamInstance = record.teamInstance;
 		String teamName = record.getTeamName();
 		if (teamInstance == null) {
 			// Instantiate (we only get here if activationKind != NONE)
@@ -124,12 +123,12 @@
 	}
 
 	@SuppressWarnings("unchecked")
-	public static Class<? extends ITeam> findTeamClass(String className, Bundle bundle) {
+	public static Class<? extends Team> findTeamClass(String className, Bundle bundle) {
 		for (String candidate : possibleTeamNames(className)) {
 			try {
 				Class<?> result = bundle.loadClass(candidate);
 				if (result != null)
-					return (Class<? extends ITeam>) result;
+					return (Class<? extends Team>) result;
 			} catch (NoClassDefFoundError|ClassNotFoundException e) {
 				// keep looking
 			}
@@ -172,13 +171,13 @@
 		return result;
 	}
 
-	private @Nullable ITeam instantiateTeam(AspectBinding aspectBinding, Class<? extends ITeam> teamClass, String teamName) {
+	private @Nullable Team instantiateTeam(AspectBinding aspectBinding, Class<? extends Team> teamClass, String teamName) {
 		// don't try to instantiate before all base classes successfully loaded.
 		if (!isReadyToLoad(aspectBinding, teamClass, null, teamName))
 			return null;
 
 		try {
-			ITeam instance = teamClass.newInstance();
+			Team instance = teamClass.newInstance();
 			TransformerPlugin.registerTeamInstance(instance);
 			log(ILogger.INFO, "Instantiated team "+teamName);
 			return instance;
@@ -194,7 +193,7 @@
 		return null;
 	}
 
-	private void activateTeam(AspectBinding aspectBinding, String teamName, ITeam teamInstance, ActivationKind activationKind)
+	private void activateTeam(AspectBinding aspectBinding, String teamName, Team teamInstance, ActivationKind activationKind)
 	{
 		// don't try to activate before all base classes successfully loaded.
 		if (!isReadyToLoad(aspectBinding, teamInstance.getClass(), teamInstance, teamName))
@@ -219,7 +218,7 @@
 			log(t, "Failed to activate team "+teamName);
 		}
 	}
-	boolean isReadyToLoad(AspectBinding aspectBinding, Class<? extends ITeam> teamClass, ITeam teamInstance, String teamName) {
+	boolean isReadyToLoad(AspectBinding aspectBinding, Class<? extends Team> teamClass, Team teamInstance, String teamName) {
 		for (String baseclass : aspectBinding.basesPerTeam.get(teamName)) {
 			if (this.beingDefined.contains(baseclass)) {
 				synchronized (deferredTeams) {
diff --git a/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/otequinox/TransformerPlugin.java b/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/otequinox/TransformerPlugin.java
index cb6eeea..fe1001b 100644
--- a/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/otequinox/TransformerPlugin.java
+++ b/plugins/org.eclipse.objectteams.osgi.weaving/src/org/eclipse/objectteams/otequinox/TransformerPlugin.java
@@ -13,7 +13,7 @@
 import org.eclipse.objectteams.internal.osgi.weaving.AspectBindingRegistry;
 import org.eclipse.objectteams.otequinox.hook.ILogger;
 import org.eclipse.objectteams.otre.ClassLoaderAccess;
-import org.objectteams.ITeam;
+import org.objectteams.Team;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -30,7 +30,7 @@
 	private static TransformerPlugin plugin;
 	
 	private AspectBindingRegistry aspectBindingRegistry;
-	private List<ITeam> teamInstances = new ArrayList<>();
+	private List<Team> teamInstances = new ArrayList<>();
 
 	/*
 	 * (non-Javadoc)
@@ -141,13 +141,13 @@
 		return result;
 	}
 
-	public static void registerTeamInstance(ITeam instance) {
+	public static void registerTeamInstance(Team instance) {
 		plugin.teamInstances.add(instance);
 	}
 	/**
 	 * Copy all registered team instances into the given list,
      */
-	public static synchronized void getTeamInstances(List<ITeam> list) {
+	public static synchronized void getTeamInstances(List<Team> list) {
 		list.addAll(plugin.teamInstances);
 	}