diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationEditor.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationEditor.java
index 1458f3d3c6..e55afaf09e 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationEditor.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/CollaborationEditor.java
@@ -43,7 +43,7 @@ import com.raytheon.viz.ui.panes.PaneManager;
 
 public class CollaborationEditor extends AbstractEditor {
 
-    public static final String EDITOR_ID = "com.raytheon.uf.viz.collaboration.display.editor.CollaborationEditor";
+    public static final String EDITOR_ID = "com.raytheon.uf.viz.collaboration.ui.editor.CollaborationEditor";
 
     @Override
     protected PaneManager getNewPaneManager() {
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/AbstractRoleEventController.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/AbstractRoleEventController.java
index 095991d6d3..ee862b5edd 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/AbstractRoleEventController.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/role/AbstractRoleEventController.java
@@ -19,7 +19,7 @@
  **/
 package com.raytheon.uf.viz.collaboration.ui.role;
 
-import com.raytheon.uf.viz.collaboration.comm.provider.session.VenueSession;
+import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession;
 
 /**
  * TODO Add Description
@@ -41,9 +41,9 @@ import com.raytheon.uf.viz.collaboration.comm.provider.session.VenueSession;
 public abstract class AbstractRoleEventController implements
         IRoleEventController {
 
-    protected VenueSession session;
+    protected ISharedDisplaySession session;
 
-    protected AbstractRoleEventController(VenueSession session) {
+    protected AbstractRoleEventController(ISharedDisplaySession session) {
         this.session = session;
     }