renamed I<type>Container to I<type>ContainerAdapter to be more descriptive

40 files changed, 125 insertions, 125 deletions

diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient1.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient1.java
index 817f916cf..069e0d937 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient1.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient1.java
@@ -15,7 +15,7 @@ import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.datashare.IChannel;
-import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.IChannelListener;
 import org.eclipse.ecf.datashare.events.IChannelEvent;
 
@@ -28,7 +28,7 @@ public class DsClient1 {
 	IChannel channel = null;
 	
 	protected IChannel createChannel(IContainer container) throws ECFException {
-		IChannelContainer channelContainer = (IChannelContainer) container.getAdapter(IChannelContainer.class);
+		IChannelContainerAdapter channelContainer = (IChannelContainerAdapter) container.getAdapter(IChannelContainerAdapter.class);
 		if (channelContainer == null) throw new NullPointerException("cannot get channel container adapter");
 		
 		ID channelID = IDFactory.getDefault().createID(channelContainer.getChannelNamespace(), "channel1");
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java
index f7d98fe2c..965bbc6c0 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/datashare/DsClient2.java
@@ -18,7 +18,7 @@ import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.datashare.BasicChannelConfig;
 import org.eclipse.ecf.datashare.IChannel;
 import org.eclipse.ecf.datashare.IChannelConfig;
-import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.IChannelListener;
 import org.eclipse.ecf.datashare.events.IChannelEvent;
 import org.eclipse.ecf.datashare.events.IChannelMessageEvent;
@@ -32,9 +32,9 @@ public class DsClient2 {
 	IChannel channel = null;
 	
 	protected IChannel createChannel(IContainer container) throws ECFException {
-		// Get IChannelContainer adapter
-		IChannelContainer channelContainer = (IChannelContainer) container
-				.getAdapter(IChannelContainer.class);
+		// Get IChannelContainerAdapter adapter
+		IChannelContainerAdapter channelContainer = (IChannelContainerAdapter) container
+				.getAdapter(IChannelContainerAdapter.class);
 		// Check it's valid, throw if not
 		if (channelContainer == null)
 			throw new NullPointerException(
diff --git a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleClient.java b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleClient.java
index 50cb7ba6c..b509a667e 100644
--- a/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleClient.java
+++ b/doc/bundles/org.eclipse.ecf.tutorial/src/org/eclipse/ecf/tutorial/scribbleshare/ScribbleClient.java
@@ -15,7 +15,7 @@ import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.datashare.IChannel;
-import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.IChannelListener;
 import org.eclipse.ecf.datashare.events.IChannelEvent;
 import org.eclipse.ecf.datashare.events.IChannelMessageEvent;
@@ -34,9 +34,9 @@ public class ScribbleClient {
 	ScribbleView scribbleView = null;
 	
 	protected void createChannel() throws ECFException {
-		// Get IChannelContainer adapter
-		IChannelContainer channelContainer = (IChannelContainer) container
-				.getAdapter(IChannelContainer.class);
+		// Get IChannelContainerAdapter adapter
+		IChannelContainerAdapter channelContainer = (IChannelContainerAdapter) container
+				.getAdapter(IChannelContainerAdapter.class);
 		// Create channel ID with fixed name 'channel2'
 		final ID channelID = IDFactory.getDefault().createID(
 				channelContainer.getChannelNamespace(), CHANNEL_ID);
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPChatClient.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPChatClient.java
index 2f85f487d..f3add750b 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPChatClient.java
+++ b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPChatClient.java
@@ -18,7 +18,7 @@ import org.eclipse.ecf.core.security.ConnectContextFactory;
 import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.presence.IMessageListener;
 import org.eclipse.ecf.presence.IMessageSender;
-import org.eclipse.ecf.presence.IPresenceContainer;
+import org.eclipse.ecf.presence.IPresenceContainerAdapter;
 import org.eclipse.ecf.presence.chat.IChatRoomContainer;
 import org.eclipse.ecf.presence.chat.IChatRoomManager;
 import org.eclipse.ecf.presence.chat.IRoomInfo;
@@ -29,7 +29,7 @@ public class XMPPChatClient {
 	
 	Namespace namespace = null;
 	IContainer container = null;
-	IPresenceContainer presence = null;
+	IPresenceContainerAdapter presence = null;
 	IMessageSender sender = null;
 	ID userID = null;
 	IChatRoomManager chatmanager = null;
@@ -60,8 +60,8 @@ public class XMPPChatClient {
 	}
 	protected void setupPresenceAdapter() {
 		// Get presence adapter off of container
-		presence = (IPresenceContainer) container
-				.getAdapter(IPresenceContainer.class);
+		presence = (IPresenceContainerAdapter) container
+				.getAdapter(IPresenceContainerAdapter.class);
 		// Get sender interface
 		sender = presence.getMessageSender();
 		// Setup message listener to handle incoming messages
@@ -71,7 +71,7 @@ public class XMPPChatClient {
 			}
 		});
 	}
-	protected IPresenceContainer getPresenceContainer() {
+	protected IPresenceContainerAdapter getPresenceContainer() {
 		return presence;
 	}
 	protected IMessageSender getMessageSender() {
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java
index 49fc2a803..029074677 100644
--- a/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java
+++ b/examples/bundles/org.eclipse.ecf.example.clients/src/org/eclipse/ecf/example/clients/XMPPClient.java
@@ -18,7 +18,7 @@ import org.eclipse.ecf.core.security.ConnectContextFactory;
 import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.presence.IMessageListener;
 import org.eclipse.ecf.presence.IMessageSender;
-import org.eclipse.ecf.presence.IPresenceContainer;
+import org.eclipse.ecf.presence.IPresenceContainerAdapter;
 import org.eclipse.ecf.presence.IPresenceListener;
 
 public class XMPPClient {
@@ -27,7 +27,7 @@ public class XMPPClient {
 	
 	Namespace namespace = null;
 	IContainer container = null;
-	IPresenceContainer presence = null;
+	IPresenceContainerAdapter presence = null;
 	IMessageSender sender = null;
 	ID userID = null;
 	
@@ -68,8 +68,8 @@ public class XMPPClient {
 	}
 	protected void setupPresence() throws ECFException {
 		if (presence == null) {
-			presence = (IPresenceContainer) container
-					.getAdapter(IPresenceContainer.class);
+			presence = (IPresenceContainerAdapter) container
+					.getAdapter(IPresenceContainerAdapter.class);
 			sender = presence.getMessageSender();
 			presence.addMessageListener(new IMessageListener() {
 				public void handleMessage(ID fromID, ID toID, Type type,
diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/Activator.java b/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/Activator.java
index 88964f9d4..d4b527fc4 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/Activator.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/Activator.java
@@ -21,7 +21,7 @@ import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.datashare.IChannel;
-import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.IChannelListener;
 import org.eclipse.ecf.example.collab.editor.message.SharedEditorSessionList;
 import org.eclipse.ecf.example.collab.editor.model.SessionInstance;
@@ -137,7 +137,7 @@ public class Activator extends AbstractUIPlugin {
 		presenceContainer = ContainerFactory.getDefault().createContainer(
 				Activator.getDefault().getPreferenceStore().getString(ClientPreferencePage.CONTAINER_TYPE));
 
-		IChannelContainer channelContainer = (IChannelContainer) presenceContainer.getAdapter(IChannelContainer.class);
+		IChannelContainerAdapter channelContainer = (IChannelContainerAdapter) presenceContainer.getAdapter(IChannelContainerAdapter.class);
 
 		final ID channelID = IDFactory.getDefault().createID(channelContainer.getChannelNamespace(),
 				Activator.getDefault().getPreferenceStore().getString(ClientPreferencePage.CHANNEL_ID) + ".presence");
diff --git a/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/listeners/EditorListener.java b/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/listeners/EditorListener.java
index f71da022f..613f5f94d 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/listeners/EditorListener.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab.editor/src/org/eclipse/ecf/example/collab/editor/listeners/EditorListener.java
@@ -21,7 +21,7 @@ import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.datashare.IChannel;
-import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.IChannelListener;
 import org.eclipse.ecf.example.collab.editor.Activator;
 import org.eclipse.ecf.example.collab.editor.message.EditorChangeMessage;
@@ -110,7 +110,7 @@ public class EditorListener implements IDocumentListener {
 		container = ContainerFactory.getDefault().createContainer(
 				Activator.getDefault().getPreferenceStore().getString(ClientPreferencePage.CONTAINER_TYPE));
 
-		IChannelContainer channelContainer = (IChannelContainer) container.getAdapter(IChannelContainer.class);
+		IChannelContainerAdapter channelContainer = (IChannelContainerAdapter) container.getAdapter(IChannelContainerAdapter.class);
 
 		sessionID = Activator.getDefault().getPreferenceStore().getString(ClientPreferencePage.CHANNEL_ID) + SESSION_NAME_DELIMITER + editor.getTitle();
 
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java
index 341093a95..4d85a1a54 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/ClientPlugin.java
@@ -16,7 +16,7 @@ import java.util.ResourceBundle;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.ecf.core.IContainer;
-import org.eclipse.ecf.discovery.IDiscoveryContainer;
+import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter;
 import org.eclipse.ecf.discovery.IServiceInfo;
 import org.eclipse.ecf.ui.views.IDiscoveryController;
 import org.eclipse.jface.resource.FontRegistry;
@@ -83,7 +83,7 @@ public class ClientPlugin extends AbstractUIPlugin implements
 			public void stopDiscovery() {
 				getDefault().disposeDiscovery();
 			}
-			public IDiscoveryContainer getDiscoveryContainer() {
+			public IDiscoveryContainerAdapter getDiscoveryContainer() {
 				synchronized (ClientPlugin.this) {
 					if (discoveryStartup == null)
 						return null;
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java
index b91285251..bc707b1f7 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabClient.java
@@ -27,7 +27,7 @@ import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.core.identity.Namespace;
 import org.eclipse.ecf.core.security.ConnectContextFactory;
 import org.eclipse.ecf.example.collab.share.EclipseCollabSharedObject;
-import org.eclipse.ecf.presence.IPresenceContainer;
+import org.eclipse.ecf.presence.IPresenceContainerAdapter;
 import org.eclipse.ecf.presence.chat.IChatRoomManager;
 
 public class CollabClient {
@@ -87,10 +87,10 @@ public class CollabClient {
 			if (ircchatRoomManagerUI.setup(newClient, targetID, username))
 				return;
 		} else {
-			// Check for IPresenceContainer....if it is, setup presence UI, if
+			// Check for IPresenceContainerAdapter....if it is, setup presence UI, if
 			// not setup shared object container
-			IPresenceContainer pc = (IPresenceContainer) newClient
-					.getAdapter(IPresenceContainer.class);
+			IPresenceContainerAdapter pc = (IPresenceContainerAdapter) newClient
+					.getAdapter(IPresenceContainerAdapter.class);
 			if (pc != null) {
 				// Setup presence UI
 				presenceContainerUI = new PresenceContainerUI(pc);
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabDiscoveryView.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabDiscoveryView.java
index e51680485..13fe33b84 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabDiscoveryView.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/CollabDiscoveryView.java
@@ -10,7 +10,7 @@
  *****************************************************************************/
 package org.eclipse.ecf.example.collab;
 
-import org.eclipse.ecf.discovery.IDiscoveryContainer;
+import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter;
 import org.eclipse.ecf.discovery.IServiceEvent;
 import org.eclipse.ecf.discovery.IServiceListener;
 import org.eclipse.ecf.discovery.IServiceTypeListener;
@@ -29,7 +29,7 @@ public class CollabDiscoveryView extends DiscoveryView {
 	public void setDiscoveryController(final IDiscoveryController controller) {
 		super.setDiscoveryController(controller);
 		if (controller != null) {
-			final IDiscoveryContainer dc = controller.getDiscoveryContainer();
+			final IDiscoveryContainerAdapter dc = controller.getDiscoveryContainer();
 			if (dc != null) {
 				// setup listeners
 				dc.addServiceTypeListener(new IServiceTypeListener() {
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
index 4e3b34708..0c91dbf6b 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/DiscoveryStartup.java
@@ -19,7 +19,7 @@ import org.eclipse.ecf.core.ContainerFactory;
 import org.eclipse.ecf.core.ContainerInstantiationException;
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.ISharedObjectContainer;
-import org.eclipse.ecf.discovery.IDiscoveryContainer;
+import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter;
 import org.eclipse.ecf.discovery.IServiceInfo;
 import org.eclipse.ecf.discovery.IServiceProperties;
 import org.eclipse.ecf.discovery.ServiceInfo;
@@ -40,13 +40,13 @@ public class DiscoveryStartup {
 	public static final int SVC_DEF_WEIGHT = 0;
 	public static final int SVC_DEF_PRIORITY = 0;
 	
-	static IDiscoveryContainer discovery = null;
+	static IDiscoveryContainerAdapter discovery = null;
 	static IContainer container = null;
 	
 	public DiscoveryStartup() throws Exception {
 		setupDiscovery();
 	}
-	protected IDiscoveryContainer getDiscoveryContainer() {
+	protected IDiscoveryContainerAdapter getDiscoveryContainer() {
 		return discovery;
 	}
 	protected IContainer getContainer() {
@@ -66,8 +66,8 @@ public class DiscoveryStartup {
 		try {
 			container = ContainerFactory.getDefault().createContainer(
 					DISCOVERY_CONTAINER);
-			discovery = (IDiscoveryContainer) container
-					.getAdapter(IDiscoveryContainer.class);
+			discovery = (IDiscoveryContainerAdapter) container
+					.getAdapter(IDiscoveryContainerAdapter.class);
 			if (discovery != null) {
 				container.connect(null, null);
 			} else {
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/PresenceContainerUI.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/PresenceContainerUI.java
index 775478661..f28492877 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/PresenceContainerUI.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/PresenceContainerUI.java
@@ -19,7 +19,7 @@ import org.eclipse.ecf.presence.IAccountManager;
 import org.eclipse.ecf.presence.IMessageListener;
 import org.eclipse.ecf.presence.IMessageSender;
 import org.eclipse.ecf.presence.IPresence;
-import org.eclipse.ecf.presence.IPresenceContainer;
+import org.eclipse.ecf.presence.IPresenceContainerAdapter;
 import org.eclipse.ecf.presence.IPresenceListener;
 import org.eclipse.ecf.presence.IPresenceSender;
 import org.eclipse.ecf.presence.IRosterEntry;
@@ -40,14 +40,14 @@ public class PresenceContainerUI {
     protected IMessageSender messageSender = null;
     protected IPresenceSender presenceSender = null;
 	protected IAccountManager accountManager = null;
-	protected IPresenceContainer pc = null;
+	protected IPresenceContainerAdapter pc = null;
 	protected ISharedObjectContainer soContainer = null;
 
 	protected org.eclipse.ecf.core.user.User localUser = null;
 	protected ID groupID = null;
 	protected IContainer container;
 	
-	public PresenceContainerUI(IPresenceContainer pc) {
+	public PresenceContainerUI(IPresenceContainerAdapter pc) {
 		this.pc = pc;
         this.messageSender = pc.getMessageSender();
         this.presenceSender = pc.getPresenceSender();
diff --git a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/start/Discovery.java b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/start/Discovery.java
index 8cd1a715c..c83fa71d0 100644
--- a/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/start/Discovery.java
+++ b/examples/bundles/org.eclipse.ecf.example.collab/src/org/eclipse/ecf/example/collab/start/Discovery.java
@@ -12,7 +12,7 @@ package org.eclipse.ecf.example.collab.start;
 
 import org.eclipse.ecf.core.ContainerFactory;
 import org.eclipse.ecf.core.IContainer;
-import org.eclipse.ecf.discovery.IDiscoveryContainer;
+import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter;
 import org.eclipse.ecf.discovery.IServiceEvent;
 import org.eclipse.ecf.discovery.IServiceListener;
 import org.eclipse.ecf.discovery.IServiceTypeListener;
@@ -21,7 +21,7 @@ import org.eclipse.ecf.discovery.identity.ServiceID;
 public class Discovery {
 	
 	IContainer container = null;
-	IDiscoveryContainer discoveryContainer = null;
+	IDiscoveryContainerAdapter discoveryContainer = null;
 	
 	public Discovery() throws Exception {
 		startDiscovery();
@@ -30,8 +30,8 @@ public class Discovery {
 		container = ContainerFactory.getDefault().createContainer(
 				"ecf.discovery.jmdns");
 		container.connect(null, null);
-		discoveryContainer = (IDiscoveryContainer) container
-				.getAdapter(IDiscoveryContainer.class);
+		discoveryContainer = (IDiscoveryContainerAdapter) container
+				.getAdapter(IDiscoveryContainerAdapter.class);
 		discoveryContainer
 				.addServiceTypeListener(new CollabServiceTypeListener());
 		System.out.println("startDiscovery()");
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainer.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainerAdaper.java
index 8b6045388..b63b6a082 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainer.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IAbstractChannelContainerAdaper.java
@@ -15,15 +15,15 @@ import org.eclipse.ecf.core.identity.Namespace;
  * Abstract channel container
  *
  */
-public interface IAbstractChannelContainer {
+public interface IAbstractChannelContainerAdaper {
 	/**
-	 * Add listener for IChannelContainer events.
+	 * Add listener for IChannelContainerAdapter events.
 	 * 
 	 * @param listener to be added
 	 */
 	public void addListener(IChannelContainerListener listener);
 	/**
-	 * Remove listener for IChannelContainer events
+	 * Remove listener for IChannelContainerAdapter events
 	 * 
 	 * @param listener to be removed.  
 	 */
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainer.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerAdapter.java
index 25bc88410..7d4945429 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainer.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerAdapter.java
@@ -18,7 +18,7 @@ import org.eclipse.ecf.core.util.ECFException;
  * way:
  * <p>
  * <pre>
- * IChannelContainer channelcontainer = (IChannelContainer) container.getAdapter(IChannelContainer.class);
+ * IChannelContainerAdapter channelcontainer = (IChannelContainerAdapter) container.getAdapter(IChannelContainerAdapter.class);
  * if (channelcontainer != null) {
  *    // use channelcontainer
  *    ...
@@ -28,7 +28,7 @@ import org.eclipse.ecf.core.util.ECFException;
  * </pre>
  * 
  */
-public interface IChannelContainer extends IAbstractChannelContainer {
+public interface IChannelContainerAdapter extends IAbstractChannelContainerAdaper {
 	/**
 	 * Create a new channel within this container
 	 * @param channelID the ID of the new channel.  Must not be null
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java
index bf8de7d57..142be8dff 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/IChannelContainerListener.java
@@ -22,7 +22,7 @@ import org.eclipse.ecf.datashare.events.IChannelContainerEvent;
 public interface IChannelContainerListener {
 	/**
 	 * Handle channel container events.  
-	 * @param event IChannelContainer event
+	 * @param event IChannelContainerAdapter event
 	 */
 	public void handleChannelContainerEvent(IChannelContainerEvent event);
 }
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java
index e0f81b12d..12c786eec 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/events/IChannelContainerEvent.java
@@ -11,7 +11,7 @@ package org.eclipse.ecf.datashare.events;
 import org.eclipse.ecf.core.identity.ID;
 
 /**
- * Super interface for events delivered to IChannelContainer instances
+ * Super interface for events delivered to IChannelContainerAdapter instances
  * @author slewis
  *
  */
diff --git a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannelContainer.java b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannelContainer.java
index af84b6e32..0c29b1e5d 100644
--- a/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannelContainer.java
+++ b/framework/bundles/org.eclipse.ecf.datashare/src/org/eclipse/ecf/datashare/mergeable/IMergeableChannelContainer.java
@@ -11,7 +11,7 @@ package org.eclipse.ecf.datashare.mergeable;
 import java.util.Map;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.core.util.ECFException;
-import org.eclipse.ecf.datashare.IAbstractChannelContainer;
+import org.eclipse.ecf.datashare.IAbstractChannelContainerAdaper;
 import org.eclipse.ecf.datashare.IChannelListener;
 
 /**
@@ -30,7 +30,7 @@ import org.eclipse.ecf.datashare.IChannelListener;
  * </pre>
  * 
  */
-public interface IMergeableChannelContainer extends IAbstractChannelContainer {
+public interface IMergeableChannelContainer extends IAbstractChannelContainerAdaper {
 	/**
 	 * Create a mergeable channel within this container
 	 * @param channelID the ID of the mergeable channel created
diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java
index 9ae99ddd3..96139d20a 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainerAdapter.java
@@ -22,13 +22,13 @@ import org.eclipse.ecf.discovery.identity.ServiceID;
  * service provider.  
  * <p>
  * This interface can be used by container provider implementations as an adapter
- * so that calls to ISharedObjectContainer.getAdapter(IDiscoveryContainer.class)
+ * so that calls to ISharedObjectContainer.getAdapter(IDiscoveryContainerAdapter.class)
  * will return a non-null instance of a class that implements this interface.
  * Clients can then proceed to use this interface to interact with the given
  * discovery implementation.
  * 
  */
-public interface IDiscoveryContainer {
+public interface IDiscoveryContainerAdapter {
 	/**
 	 * Add a service listener.  The given listener will have its method called
 	 * when a service with a type matching that specified by the first parameter
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java
index 1c22e68ed..addcc2faa 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/AbstractPresenceContainer.java
@@ -19,7 +19,7 @@ import org.eclipse.ecf.presence.chat.IChatRoomManager;
 /**
  * An abstract presence container implementation
  */
-public abstract class AbstractPresenceContainer implements IPresenceContainer {
+public abstract class AbstractPresenceContainer implements IPresenceContainerAdapter {
 
 	private Vector messageListeners = new Vector();
 
@@ -28,21 +28,21 @@ public abstract class AbstractPresenceContainer implements IPresenceContainer {
 	private Vector subscribeListeners = new Vector();
 
 	/**
-	 * @see org.eclipse.ecf.presence.IPresenceContainer#addSubscribeListener(org.eclipse.ecf.presence.ISubscribeListener)
+	 * @see org.eclipse.ecf.presence.IPresenceContainerAdapter#addSubscribeListener(org.eclipse.ecf.presence.ISubscribeListener)
 	 */
 	public void addSubscribeListener(ISubscribeListener listener) {
 		subscribeListeners.add(listener);
 	}
 
 	/**
-	 * @see org.eclipse.ecf.presence.IPresenceContainer#addPresenceListener(org.eclipse.ecf.presence.IPresenceListener)
+	 * @see org.eclipse.ecf.presence.IPresenceContainerAdapter#addPresenceListener(org.eclipse.ecf.presence.IPresenceListener)
 	 */
 	public void addPresenceListener(IPresenceListener listener) {
 		presenceListeners.add(listener);
 	}
 
 	/**
-	 * @see org.eclipse.ecf.presence.IPresenceContainer#addMessageListener(org.eclipse.ecf.presence.IMessageListener)
+	 * @see org.eclipse.ecf.presence.IPresenceContainerAdapter#addMessageListener(org.eclipse.ecf.presence.IMessageListener)
 	 */
 	public void addMessageListener(IMessageListener listener) {
 		messageListeners.add(listener);
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMessageListener.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMessageListener.java
index fe15b4725..77fd0349b 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMessageListener.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IMessageListener.java
@@ -15,7 +15,7 @@ import org.eclipse.ecf.core.identity.ID;
 
 /**
  * Listener for text IM messages. Implementers of this interface are registered
- * via the IPresenceContainer.addMessageListener interface
+ * via the IPresenceContainerAdapter.addMessageListener interface
  * 
  */
 public interface IMessageListener {
diff --git a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainer.java b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java
index 3c6dab08a..cf6f75e7d 100644
--- a/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainer.java
+++ b/framework/bundles/org.eclipse.ecf.presence/src/org/eclipse/ecf/presence/IPresenceContainerAdapter.java
@@ -22,7 +22,7 @@ import org.eclipse.ecf.presence.chat.IChatRoomManager;
  * To use this adapter:
  * 
  * <pre>
- *  IPresenceContainer presenceContainer = (IPresenceContainer) container.getAdapter(IPresenceContainer.class);
+ *  IPresenceContainerAdapter presenceContainer = (IPresenceContainerAdapter) container.getAdapter(IPresenceContainerAdapter.class);
  *  if (presenceContainer != null) {
  *     ...use presenceContainer
  *  } else {
@@ -31,7 +31,7 @@ import org.eclipse.ecf.presence.chat.IChatRoomManager;
  * </pre>
  * 
  */
-public interface IPresenceContainer extends IAdaptable {
+public interface IPresenceContainerAdapter extends IAdaptable {
 
 	/**
 	 * Setup listener for handling subscription requests. The given listener
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java
index 56b2b8d9a..e70a45426 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteService.java
@@ -15,7 +15,7 @@ import org.eclipse.ecf.core.util.ECFException;
 
 /**
  * Interface providing runtime access to a remote service.  An instance
- * implementing this interface will be returned from the IRemoteServiceContainer.getRemoteService(IRemoteServiceReference)
+ * implementing this interface will be returned from the IRemoteServiceContainerAdapter.getRemoteService(IRemoteServiceReference)
  * and may then be used to communicate with a remote service.  The methods on this interface support accessing
  * the remote service in several ways:<br/>
  * <ul>
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainer.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainerAdapter.java
index 223c87dae..4fc49bb72 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainer.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceContainerAdapter.java
@@ -20,7 +20,7 @@ import org.eclipse.ecf.core.identity.ID;
  * remote services through ECF containers.  
  *
  */
-public interface IRemoteServiceContainer {
+public interface IRemoteServiceContainerAdapter {
 
 	/**
 	 * Add listener for remote service registration/unregistration for this
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java
index 892bddb06..4e7210783 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/IRemoteServiceReference.java
@@ -15,11 +15,11 @@ import org.eclipse.ecf.core.identity.ID;
 
 /**
  * Remote service reference.  Instances implementing this
- * interface are returned from the IRemoteServiceContainer.getRemoteServiceReferences call.
+ * interface are returned from the IRemoteServiceContainerAdapter.getRemoteServiceReferences call.
  * Once retrieved, such references can be resolved to
- * an IRemoteService via calls to IRemoteServiceContainer.getRemoteService(reference)
+ * an IRemoteService via calls to IRemoteServiceContainerAdapter.getRemoteService(reference)
  *
- * @see org.eclipse.ecf.remoteservice.IRemoteServiceContainer
+ * @see org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter
  */
 public interface IRemoteServiceReference {
 	/**
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java
index 4b92bc49c..aed708d9f 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java
@@ -18,7 +18,7 @@ import java.util.Enumeration;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.ecf.core.IContainer;
-import org.eclipse.ecf.discovery.IDiscoveryContainer;
+import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter;
 import org.eclipse.ecf.discovery.IServiceInfo;
 import org.eclipse.ecf.discovery.IServiceProperties;
 import org.eclipse.ecf.discovery.identity.ServiceID;
@@ -116,7 +116,7 @@ public class DiscoveryView extends ViewPart {
 			return c.getContainer();
 		}
 	}
-	protected IDiscoveryContainer getDiscoveryContainer() {
+	protected IDiscoveryContainerAdapter getDiscoveryContainer() {
 		IDiscoveryController c = getController();
 		if (c == null) return null;
 		else {
@@ -488,7 +488,7 @@ public class DiscoveryView extends ViewPart {
                 if (treeObject instanceof TreeParent) {
                 	TreeParent p = (TreeParent) treeObject;
                     final ServiceID targetID = p.getID();
-                    IDiscoveryContainer dcontainer = getDiscoveryContainer();
+                    IDiscoveryContainerAdapter dcontainer = getDiscoveryContainer();
                     if (dcontainer != null) {
                     	dcontainer.requestServiceInfo(targetID,SERVICE_INFO_TIMEOUT);
                     }
@@ -504,7 +504,7 @@ public class DiscoveryView extends ViewPart {
                 TreeObject treeObject = getSelectedTreeObject();
                 if (treeObject instanceof TreeParent) {
                 	TreeParent p = (TreeParent) treeObject;
-                    IDiscoveryContainer dcontainer = getDiscoveryContainer();
+                    IDiscoveryContainerAdapter dcontainer = getDiscoveryContainer();
                     if (dcontainer != null) {
                     	dcontainer.registerServiceType(p.getName());
                     }
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/IDiscoveryController.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/IDiscoveryController.java
index c4abd4c2f..35f6b9394 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/IDiscoveryController.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/IDiscoveryController.java
@@ -12,11 +12,11 @@
 package org.eclipse.ecf.ui.views;
 
 import org.eclipse.ecf.core.IContainer;
-import org.eclipse.ecf.discovery.IDiscoveryContainer;
+import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter;
 import org.eclipse.ecf.discovery.IServiceInfo;
 
 public interface IDiscoveryController {
-	public IDiscoveryContainer getDiscoveryContainer();
+	public IDiscoveryContainerAdapter getDiscoveryContainer();
 	public IContainer getContainer();
 	public String [] getServiceTypes();
 	public void connectToService(IServiceInfo service);
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java
index 3d1c47ca8..ad5aeb1d7 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/RosterView.java
@@ -41,7 +41,7 @@ import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.presence.IAccountManager;
 import org.eclipse.ecf.presence.IMessageListener;
 import org.eclipse.ecf.presence.IPresence;
-import org.eclipse.ecf.presence.IPresenceContainer;
+import org.eclipse.ecf.presence.IPresenceContainerAdapter;
 import org.eclipse.ecf.presence.IPresenceListener;
 import org.eclipse.ecf.presence.IRosterEntry;
 import org.eclipse.ecf.presence.IRosterGroup;
@@ -120,12 +120,12 @@ public class RosterView extends ViewPart implements IChatRoomViewCloseListener {
 		ID serviceID;
 		IUser user;
 		ILocalInputHandler inputHandler;
-		IPresenceContainer container;
+		IPresenceContainerAdapter container;
 		ISharedObjectContainer soContainer;
 		ISharedObject sharedObject = null;
 		
 		public UserAccount(ID serviceID, IUser user,
-				ILocalInputHandler handler, IPresenceContainer container, ISharedObjectContainer soContainer) {
+				ILocalInputHandler handler, IPresenceContainerAdapter container, ISharedObjectContainer soContainer) {
 			this.serviceID = serviceID;
 			this.user = user;
 			this.inputHandler = handler;
@@ -143,7 +143,7 @@ public class RosterView extends ViewPart implements IChatRoomViewCloseListener {
 		public ILocalInputHandler getInputHandler() {
 			return inputHandler;
 		}
-		public IPresenceContainer getPresenceContainer() {
+		public IPresenceContainerAdapter getPresenceContainer() {
 			return container;
 		}
 		public ISharedObjectContainer getSOContainer() {
@@ -857,7 +857,7 @@ public class RosterView extends ViewPart implements IChatRoomViewCloseListener {
 	protected void changePasswordForAccount(ID accountID) {
 		UserAccount account = getAccount(accountID);
 		if (account != null) {
-			IPresenceContainer pc = account.getPresenceContainer();
+			IPresenceContainerAdapter pc = account.getPresenceContainer();
 			IAccountManager am = pc.getAccountManager();
 			ChangePasswordDialog cpd = new ChangePasswordDialog(viewer.getControl().getShell());
 			cpd.open();
@@ -1335,7 +1335,7 @@ public class RosterView extends ViewPart implements IChatRoomViewCloseListener {
 		}
 	}
 	public void addAccount(ID account, IUser user, ILocalInputHandler handler,
-			IPresenceContainer container, ISharedObjectContainer soContainer) {
+			IPresenceContainerAdapter container, ISharedObjectContainer soContainer) {
 		addAccount(new UserAccount(account, user, handler, container, soContainer));
 		setToolbarEnabled(true);
 	}
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java
index c42347228..ad0d6324a 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/BaseChannel.java
@@ -22,7 +22,7 @@ import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.core.util.Event;
 import org.eclipse.ecf.core.util.IEventProcessor;
 import org.eclipse.ecf.datashare.IChannel;
-import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.IChannelListener;
 import org.eclipse.ecf.datashare.events.IChannelEvent;
 import org.eclipse.ecf.datashare.events.IChannelGroupDepartEvent;
@@ -282,7 +282,7 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
      * Note that this implementation checks for the existence of the RECEIVER_ID_PROPERTY on the
      * replica's properties, and if the property contains a valid ID will 
      * <ul>
-     * <li>lookup the IChannel on the given container via IChannelContainer.getID(ID)</li>
+     * <li>lookup the IChannel on the given container via IChannelContainerAdapter.getID(ID)</li>
      * <li>call IChannel.getListener() to retrieve the listener for the channel returned</li>
      * <li>set the listener for this object to the value returned from IChannel.getListener()</li>
      * </ul>
@@ -298,7 +298,7 @@ public class BaseChannel extends TransactionSharedObject implements IChannel {
 		}
 		if (rcvr != null) {
 			// Now...get local channel container first...throw if we can't get it
-			IChannelContainer container = (IChannelContainer) getContext().getAdapter(IChannelContainer.class);
+			IChannelContainerAdapter container = (IChannelContainerAdapter) getContext().getAdapter(IChannelContainerAdapter.class);
 			if (container == null) throw new SharedObjectInitException("channel container is null/not available");
 			// Now get receiver IChannel...throw if we can't get it
 			final IChannel receiver = container.getChannel(rcvr);
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java
index 4a2491a8b..8a9e229d9 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainer.java
@@ -16,13 +16,13 @@ import org.eclipse.ecf.core.identity.Namespace;
 import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.datashare.IChannel;
 import org.eclipse.ecf.datashare.IChannelConfig;
-import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.IChannelContainerListener;
 import org.eclipse.ecf.datashare.IChannelListener;
 import org.eclipse.ecf.provider.generic.TCPClientSOContainer;
 
 public class DatashareContainer extends TCPClientSOContainer implements
-		IChannelContainer {
+		IChannelContainerAdapter {
 	protected static final int DEFAULT_CONTAINER_KEEP_ALIVE = 30000;
 	protected static final int DEFAULT_TRANSACTION_WAIT = 30000;
 	
@@ -35,7 +35,7 @@ public class DatashareContainer extends TCPClientSOContainer implements
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#createChannel(org.eclipse.ecf.datashare.IChannelConfig)
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#createChannel(org.eclipse.ecf.datashare.IChannelConfig)
 	 */
 	public IChannel createChannel(final ID newID,
 			final IChannelListener listener, final Map properties)
@@ -49,7 +49,7 @@ public class DatashareContainer extends TCPClientSOContainer implements
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#getChannel(org.eclipse.ecf.core.identity.ID)
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#getChannel(org.eclipse.ecf.core.identity.ID)
 	 */
 	public IChannel getChannel(ID channelID) {
 		return adapter.getChannel(channelID);
@@ -57,14 +57,14 @@ public class DatashareContainer extends TCPClientSOContainer implements
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#disposeChannel(org.eclipse.ecf.core.identity.ID)
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#disposeChannel(org.eclipse.ecf.core.identity.ID)
 	 */
 	public boolean removeChannel(ID channelID) {
 		return adapter.removeChannel(channelID);
 	}
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#getChannelNamespace()
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#getChannelNamespace()
 	 */
 	public Namespace getChannelNamespace() {
 		return adapter.getChannelNamespace();
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java
index 8214c4692..5d562344b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapter.java
@@ -37,7 +37,7 @@ import org.eclipse.ecf.core.identity.StringID;
 import org.eclipse.ecf.core.util.ECFException;
 import org.eclipse.ecf.datashare.IChannel;
 import org.eclipse.ecf.datashare.IChannelConfig;
-import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.IChannelContainerListener;
 import org.eclipse.ecf.datashare.IChannelListener;
 import org.eclipse.ecf.datashare.events.IChannelContainerChannelActivatedEvent;
@@ -45,7 +45,7 @@ import org.eclipse.ecf.datashare.events.IChannelContainerEvent;
 import org.eclipse.ecf.datashare.events.IChannelContainerChannelDeactivatedEvent;
 import org.eclipse.ecf.provider.generic.SOContainer;
 
-public class DatashareContainerAdapter implements IChannelContainer {
+public class DatashareContainerAdapter implements IChannelContainerAdapter {
 	
 	protected SOContainer container = null;
 	protected static final int DEFAULT_TRANSACTION_WAIT = 30000;
@@ -103,7 +103,7 @@ public class DatashareContainerAdapter implements IChannelContainer {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#createChannel(org.eclipse.ecf.datashare.IChannelConfig)
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#createChannel(org.eclipse.ecf.datashare.IChannelConfig)
 	 */
 	public IChannel createChannel(final ID newID,
 			final IChannelListener listener, final Map properties)
@@ -208,7 +208,7 @@ public class DatashareContainerAdapter implements IChannelContainer {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#getChannel(org.eclipse.ecf.core.identity.ID)
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#getChannel(org.eclipse.ecf.core.identity.ID)
 	 */
 	public IChannel getChannel(ID channelID) {
 		return (IChannel) container.getSharedObjectManager().getSharedObject(channelID);
@@ -216,7 +216,7 @@ public class DatashareContainerAdapter implements IChannelContainer {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#disposeChannel(org.eclipse.ecf.core.identity.ID)
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#disposeChannel(org.eclipse.ecf.core.identity.ID)
 	 */
 	public boolean removeChannel(ID channelID) {
 		ISharedObject o = container.getSharedObjectManager()
@@ -225,7 +225,7 @@ public class DatashareContainerAdapter implements IChannelContainer {
 	}
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#getChannelNamespace()
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#getChannelNamespace()
 	 */
 	public Namespace getChannelNamespace() {
 		return IDFactory.getDefault().getNamespaceByName(StringID.class.getName());
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapterFactory.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapterFactory.java
index 240a4f5c9..a5b7212cb 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapterFactory.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/DatashareContainerAdapterFactory.java
@@ -13,19 +13,19 @@ package org.eclipse.ecf.provider.datashare;
 import org.eclipse.ecf.core.AbstractSharedObjectContainerAdapterFactory;
 import org.eclipse.ecf.core.ISharedObject;
 import org.eclipse.ecf.core.ISharedObjectContainer;
-import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 
 public class DatashareContainerAdapterFactory extends
 		AbstractSharedObjectContainerAdapterFactory {
 
 	protected ISharedObject createAdapter(ISharedObjectContainer container, Class adapterType) {
-		if (adapterType.equals(IChannelContainer.class)) {
+		if (adapterType.equals(IChannelContainerAdapter.class)) {
 			return new SharedObjectDatashareContainerAdapter();
 		} else return null;
 	}
 
 	public Class[] getAdapterList() {
-		return new Class[] { IChannelContainer.class };
+		return new Class[] { IChannelContainerAdapter.class };
 	}
 
 }
diff --git a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java
index 55d6be5d1..650ce392e 100644
--- a/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java
+++ b/providers/bundles/org.eclipse.ecf.provider.datashare/src/org/eclipse/ecf/provider/datashare/SharedObjectDatashareContainerAdapter.java
@@ -40,14 +40,14 @@ import org.eclipse.ecf.core.util.Event;
 import org.eclipse.ecf.core.util.IEventProcessor;
 import org.eclipse.ecf.datashare.IChannel;
 import org.eclipse.ecf.datashare.IChannelConfig;
-import org.eclipse.ecf.datashare.IChannelContainer;
+import org.eclipse.ecf.datashare.IChannelContainerAdapter;
 import org.eclipse.ecf.datashare.IChannelContainerListener;
 import org.eclipse.ecf.datashare.IChannelListener;
 import org.eclipse.ecf.datashare.events.IChannelContainerChannelActivatedEvent;
 import org.eclipse.ecf.datashare.events.IChannelContainerChannelDeactivatedEvent;
 import org.eclipse.ecf.datashare.events.IChannelContainerEvent;
 
-public class SharedObjectDatashareContainerAdapter extends AbstractSharedObject implements IChannelContainer {
+public class SharedObjectDatashareContainerAdapter extends AbstractSharedObject implements IChannelContainerAdapter {
 	
 	protected static final int DEFAULT_TRANSACTION_WAIT = 30000;
 	
@@ -104,7 +104,7 @@ public class SharedObjectDatashareContainerAdapter extends AbstractSharedObject
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#createChannel(org.eclipse.ecf.datashare.IChannelConfig)
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#createChannel(org.eclipse.ecf.datashare.IChannelConfig)
 	 */
 	public IChannel createChannel(final ID newID,
 			final IChannelListener listener, final Map properties)
@@ -209,7 +209,7 @@ public class SharedObjectDatashareContainerAdapter extends AbstractSharedObject
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#getChannel(org.eclipse.ecf.core.identity.ID)
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#getChannel(org.eclipse.ecf.core.identity.ID)
 	 */
 	public IChannel getChannel(ID channelID) {
 		return (IChannel) getContext().getSharedObjectManager().getSharedObject(channelID);
@@ -217,7 +217,7 @@ public class SharedObjectDatashareContainerAdapter extends AbstractSharedObject
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#disposeChannel(org.eclipse.ecf.core.identity.ID)
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#disposeChannel(org.eclipse.ecf.core.identity.ID)
 	 */
 	public boolean removeChannel(ID channelID) {
 		ISharedObject o = getContext().getSharedObjectManager()
@@ -226,7 +226,7 @@ public class SharedObjectDatashareContainerAdapter extends AbstractSharedObject
 	}
 	/*
 	 * (non-Javadoc)
-	 * @see org.eclipse.ecf.datashare.IChannelContainer#getChannelNamespace()
+	 * @see org.eclipse.ecf.datashare.IChannelContainerAdapter#getChannelNamespace()
 	 */
 	public Namespace getChannelNamespace() {
 		return IDFactory.getDefault().getNamespaceByName(StringID.class.getName());
diff --git a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java
index 88eeee32b..359c470a6 100644
--- a/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.jmdns/src/org/eclipse/ecf/provider/jmdns/container/JMDNSDiscoveryContainer.java
@@ -41,7 +41,7 @@ import org.eclipse.ecf.core.identity.IDFactory;
 import org.eclipse.ecf.core.identity.IDInstantiationException;
 import org.eclipse.ecf.core.identity.Namespace;
 import org.eclipse.ecf.core.security.IConnectContext;
-import org.eclipse.ecf.discovery.IDiscoveryContainer;
+import org.eclipse.ecf.discovery.IDiscoveryContainerAdapter;
 import org.eclipse.ecf.discovery.IServiceInfo;
 import org.eclipse.ecf.discovery.IServiceListener;
 import org.eclipse.ecf.discovery.IServiceProperties;
@@ -54,7 +54,7 @@ import org.eclipse.ecf.provider.jmdns.Trace;
 import org.eclipse.ecf.provider.jmdns.identity.JMDNSServiceID;
 
 public class JMDNSDiscoveryContainer implements IContainer,
-		IDiscoveryContainer, ServiceListener, ServiceTypeListener {
+		IDiscoveryContainerAdapter, ServiceListener, ServiceTypeListener {
 	public static final int DEFAULT_REQUEST_TIMEOUT = 3000;
 	protected static String JMDNS_NAMESPACE_ID = Messages.getString("JmdnsPlugin.namespace.identifier"); //$NON-NLS-1$;
 		
diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
index 81847914f..f56f1d524 100644
--- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
+++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RegistrySharedObject.java
@@ -37,7 +37,7 @@ import org.eclipse.ecf.remoteservice.IRemoteCall;
 import org.eclipse.ecf.remoteservice.IRemoteCallListener;
 import org.eclipse.ecf.remoteservice.IRemoteFilter;
 import org.eclipse.ecf.remoteservice.IRemoteService;
-import org.eclipse.ecf.remoteservice.IRemoteServiceContainer;
+import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
 import org.eclipse.ecf.remoteservice.IRemoteServiceListener;
 import org.eclipse.ecf.remoteservice.IRemoteServiceReference;
 import org.eclipse.ecf.remoteservice.IRemoteServiceRegistration;
@@ -47,7 +47,7 @@ import org.eclipse.ecf.remoteservice.events.IRemoteServiceEvent;
 import org.eclipse.ecf.remoteservice.events.IRemoteServiceRegisteredEvent;
 import org.eclipse.ecf.remoteservice.events.IRemoteServiceUnregisteredEvent;
 
-public class RegistrySharedObject extends AbstractSharedObject implements IRemoteServiceContainer {
+public class RegistrySharedObject extends AbstractSharedObject implements IRemoteServiceContainerAdapter {
 
 	Trace trace = Trace.create("registrysharedobject");
 
@@ -60,7 +60,7 @@ public class RegistrySharedObject extends AbstractSharedObject implements IRemot
 	public RegistrySharedObject() {
 	}
 
-	/* Begin implementation of IRemoteServiceContainer public interface */
+	/* Begin implementation of IRemoteServiceContainerAdapter public interface */
 	public void addRemoteServiceListener(IRemoteServiceListener listener) {
 		trace("addRemoteServiceListener(" + listener + ")");
 		synchronized (serviceListeners) {
@@ -143,7 +143,7 @@ public class RegistrySharedObject extends AbstractSharedObject implements IRemot
 		return true;
 	}
 
-	/* End implementation of IRemoteServiceContainer public interface */
+	/* End implementation of IRemoteServiceContainerAdapter public interface */
 
 	public void initialize() throws SharedObjectInitException {
 		super.initialize();
diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainer.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainer.java
index 14735b7c0..c750936f1 100644
--- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainer.java
@@ -14,15 +14,15 @@ import org.eclipse.ecf.core.ISharedObjectContainerConfig;
 import org.eclipse.ecf.core.identity.ID;
 import org.eclipse.ecf.provider.generic.TCPClientSOContainer;
 import org.eclipse.ecf.remoteservice.IRemoteService;
-import org.eclipse.ecf.remoteservice.IRemoteServiceContainer;
+import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
 import org.eclipse.ecf.remoteservice.IRemoteServiceListener;
 import org.eclipse.ecf.remoteservice.IRemoteServiceReference;
 import org.eclipse.ecf.remoteservice.IRemoteServiceRegistration;
 
 public class RemoteServiceContainer extends TCPClientSOContainer
-		implements IRemoteServiceContainer {
+		implements IRemoteServiceContainerAdapter {
 
-	protected IRemoteServiceContainer registry;
+	protected IRemoteServiceContainerAdapter registry;
 	
 	protected void createRegistry() {
 		registry = new RegistrySharedObject();
diff --git a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java
index 0088f8078..149ba8231 100644
--- a/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java
+++ b/providers/bundles/org.eclipse.ecf.provider.remoteservice/src/org/eclipse/ecf/provider/remoteservice/generic/RemoteServiceContainerAdapterFactory.java
@@ -11,17 +11,17 @@ package org.eclipse.ecf.provider.remoteservice.generic;
 import org.eclipse.ecf.core.AbstractSharedObjectContainerAdapterFactory;
 import org.eclipse.ecf.core.ISharedObject;
 import org.eclipse.ecf.core.ISharedObjectContainer;
-import org.eclipse.ecf.remoteservice.IRemoteServiceContainer;
+import org.eclipse.ecf.remoteservice.IRemoteServiceContainerAdapter;
 
 public class RemoteServiceContainerAdapterFactory extends AbstractSharedObjectContainerAdapterFactory {
 
 	protected ISharedObject createAdapter(ISharedObjectContainer container, Class adapterType) {
-		if (adapterType.equals(IRemoteServiceContainer.class)) return new RegistrySharedObject();
+		if (adapterType.equals(IRemoteServiceContainerAdapter.class)) return new RegistrySharedObject();
 		else return null;
 	}
 
 	public Class[] getAdapterList() {
-		return new Class[] { IRemoteServiceContainer.class };
+		return new Class[] { IRemoteServiceContainerAdapter.class };
 	}
 	
 }
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
index 01194b600..fad1b5498 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/container/XMPPClientSOContainer.java
@@ -42,14 +42,14 @@ import org.eclipse.ecf.filetransfer.FileTransferInfo;
 import org.eclipse.ecf.filetransfer.IFileTransferInfo;
 import org.eclipse.ecf.filetransfer.IFileTransferListener;
 import org.eclipse.ecf.filetransfer.IIncomingFileTransferRequestListener;
-import org.eclipse.ecf.filetransfer.IOutgoingFileTransferContainer;
+import org.eclipse.ecf.filetransfer.IOutgoingFileTransferContainerAdapter;
 import org.eclipse.ecf.filetransfer.OutgoingFileTransferException;
 import org.eclipse.ecf.filetransfer.events.IFileTransferEvent;
 import org.eclipse.ecf.presence.IAccountManager;
 import org.eclipse.ecf.presence.IMessageListener;
 import org.eclipse.ecf.presence.IMessageSender;
 import org.eclipse.ecf.presence.IPresence;
-import org.eclipse.ecf.presence.IPresenceContainer;
+import org.eclipse.ecf.presence.IPresenceContainerAdapter;
 import org.eclipse.ecf.presence.IPresenceListener;
 import org.eclipse.ecf.presence.IPresenceSender;
 import org.eclipse.ecf.presence.ISubscribeListener;
@@ -88,7 +88,7 @@ import org.jivesoftware.smackx.muc.RoomInfo;
 import org.jivesoftware.smackx.packet.MUCUser;
 
 public class XMPPClientSOContainer extends ClientSOContainer implements
-		IOutgoingFileTransferContainer {
+		IOutgoingFileTransferContainerAdapter {
 
 	public static final int DEFAULT_KEEPALIVE = 30000;
 
@@ -439,8 +439,8 @@ public class XMPPClientSOContainer extends ClientSOContainer implements
 	}
 
 	public Object getAdapter(Class clazz) {
-		if (clazz.equals(IPresenceContainer.class)) {
-			return new IPresenceContainer() {
+		if (clazz.equals(IPresenceContainerAdapter.class)) {
+			return new IPresenceContainerAdapter() {
 
 				public Object getAdapter(Class clazz) {
 					return null;
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/jingle/XMPPJingleContainer.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/jingle/XMPPJingleContainer.java
index 3074f180c..1a511908c 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/jingle/XMPPJingleContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/jingle/XMPPJingleContainer.java
@@ -16,7 +16,7 @@ package org.eclipse.ecf.provider.xmpp.jingle;
 import java.util.ArrayList;
 
 import org.eclipse.ecf.call.CallException;
-import org.eclipse.ecf.call.ICallContainer;
+import org.eclipse.ecf.call.ICallContainerAdapter;
 import org.eclipse.ecf.call.ICallDescription;
 import org.eclipse.ecf.call.ICallSession;
 import org.eclipse.ecf.call.ICallSessionListener;
@@ -39,7 +39,7 @@ import org.jivesoftware.smackx.nat.TransportResolver;
  * @author Pierre-Henry Perret
  *
  */
-public class XMPPJingleContainer implements ICallContainer, ICallSessionListener {
+public class XMPPJingleContainer implements ICallContainerAdapter, ICallSessionListener {
 
 	private TransportResolver tm= null;
 	private XMPPConnection conn= null;
@@ -71,7 +71,7 @@ public class XMPPJingleContainer implements ICallContainer, ICallSessionListener
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.call.ICallContainer#addListener(org.eclipse.ecf.call.ICallSessionListener)
+	 * @see org.eclipse.ecf.call.ICallContainerAdapter#addListener(org.eclipse.ecf.call.ICallSessionListener)
 	 */
 	public void addListener(ICallSessionListener listener) {
 		
@@ -79,7 +79,7 @@ public class XMPPJingleContainer implements ICallContainer, ICallSessionListener
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.ecf.call.ICallContainer#createCallSession()
+	 * @see org.eclipse.ecf.call.ICallContainerAdapter#createCallSession()
 	 */
 	public ICallSession createCallSession() {
 		
diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/jingle/test/JingleTest.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/jingle/test/JingleTest.java
index a9d1289b2..9d0f51ad4 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/jingle/test/JingleTest.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/provider/xmpp/jingle/test/JingleTest.java
@@ -1,6 +1,6 @@
 package org.eclipse.ecf.provider.xmpp.jingle.test;
 
-import org.eclipse.ecf.call.ICallContainer;
+import org.eclipse.ecf.call.ICallContainerAdapter;
 import org.eclipse.ecf.provider.xmpp.container.XMPPClientSOContainer;
 
 public class JingleTest {
@@ -15,7 +15,7 @@ public class JingleTest {
 
 			// client1 make a call to client2
 			// this installs request listener for incoming sessions
-			ICallContainer jingle1= (ICallContainer)client1.getAdapter( ICallContainer.class );
+			ICallContainerAdapter jingle1= (ICallContainerAdapter)client1.getAdapter( ICallContainerAdapter.class );
 			// create a call session
 			jingle1.createCallSession( client1.getID() );