"Team Workflow" - EX4MF - "Investigate and resolve performance issues where events cause single loads by artId"

83 files changed, 379 insertions, 380 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
index 22a73fcc75c..4d3672fbba6 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
@@ -37,9 +37,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
 import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.MultipleAttributesExist;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
@@ -95,7 +95,7 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IWorld
    public void onInitializationComplete() {
       super.onInitializationComplete();
       initializeSMA();
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
index a29c0c9071b..3bed052db67 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAEditor.java
@@ -31,10 +31,10 @@ import org.eclipse.osee.framework.skynet.core.access.PermissionEnum;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.relation.RelationModType;
 import org.eclipse.osee.framework.skynet.core.transaction.AbstractSkynetTxTemplate;
@@ -196,7 +196,7 @@ public class SMAEditor extends AbstractArtifactEditor implements IDirtiableEdito
          smaMgr = new SMAManager(sma, this);
          smaMgr.setEditor(this);
 
-         XEventManager.addListener(this, this);
+         OseeEventManager.addListener(this, this);
 
          setPartName(smaMgr.getSma().getEditorTitle());
          setContentDescription(priviledgedEditMode != PriviledgedEditMode.Off ? " PRIVILEGED EDIT MODE ENABLED - " + priviledgedEditMode.name() : "");
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATaskComposite.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATaskComposite.java
index 9d14f2edbf1..84f7f7863a4 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATaskComposite.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMATaskComposite.java
@@ -19,11 +19,11 @@ import org.eclipse.osee.ats.util.widgets.task.TaskContentProvider;
 import org.eclipse.osee.ats.util.widgets.task.XTaskViewer;
 import org.eclipse.osee.framework.jdk.core.util.AHTML;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactsChangeTypeEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactsPurgedEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IArtifactsChangeTypeEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IArtifactsPurgedEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.event.UnloadedArtifact;
@@ -77,7 +77,7 @@ public class SMATaskComposite extends Composite {
    @Override
    public void dispose() {
       xTaskViewer.dispose();
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
       super.dispose();
    }
 
@@ -86,7 +86,7 @@ public class SMATaskComposite extends Composite {
    }
 
    private void registerEvents() {
-      XEventManager.addListener(this, new IArtifactsPurgedEventListener() {
+      OseeEventManager.addListener(this, new IArtifactsPurgedEventListener() {
 
          @Override
          public void handleArtifactsPurgedEvent(Sender sender, final Collection<? extends Artifact> cacheArtifacts, Collection<UnloadedArtifact> unloadedArtifacts) {
@@ -95,7 +95,7 @@ public class SMATaskComposite extends Composite {
             ((TaskContentProvider) xTaskViewer.getXViewer().getContentProvider()).remove(cacheArtifacts);
          }
       });
-      XEventManager.addListener(this, new IArtifactsChangeTypeEventListener() {
+      OseeEventManager.addListener(this, new IArtifactsChangeTypeEventListener() {
 
          @Override
          public void handleArtifactsChangeTypeEvent(Sender sender, int toArtifactTypeId, final Collection<? extends Artifact> cacheArtifacts, Collection<UnloadedArtifact> unloadedArtifacts) {
@@ -105,7 +105,7 @@ public class SMATaskComposite extends Composite {
          }
 
       });
-      XEventManager.addListener(this, new IFrameworkTransactionEventListener() {
+      OseeEventManager.addListener(this, new IFrameworkTransactionEventListener() {
 
          @Override
          public void handleFrameworkTransactionEvent(Source source, final FrameworkTransactionData transData) {
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitManagerService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitManagerService.java
index d513fa6e199..663dd08c0ae 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitManagerService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitManagerService.java
@@ -17,8 +17,8 @@ import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.util.AtsBranchManager;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
-import org.eclipse.osee.framework.skynet.core.eventx.BranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.BranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
 import org.eclipse.osee.framework.ui.skynet.widgets.IBranchArtifact;
@@ -70,7 +70,7 @@ public class CommitManagerService extends WorkPageService {
                }
             });
 
-         XEventManager.addListener(this, new BranchEventListener() {
+         OseeEventManager.addListener(this, new BranchEventListener() {
             /* (non-Javadoc)
              * @see org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener#handleBranchEvent(org.eclipse.osee.framework.ui.plugin.event.Sender, org.eclipse.osee.framework.skynet.core.artifact.BranchModType, org.eclipse.osee.framework.skynet.core.artifact.Branch, int)
              */
@@ -139,6 +139,6 @@ public class CommitManagerService extends WorkPageService {
     */
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java
index dd9a1319572..1c274967670 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CommitWorkingBranchService.java
@@ -18,8 +18,8 @@ import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.util.AtsBranchManager;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.plugin.util.Result;
@@ -82,7 +82,7 @@ public class CommitWorkingBranchService extends WorkPageService implements IBran
                }
             });
       }
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       refresh();
    }
 
@@ -128,7 +128,7 @@ public class CommitWorkingBranchService extends WorkPageService implements IBran
     */
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CreateWorkingBranchService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CreateWorkingBranchService.java
index 7550aaff506..d71dd543e2f 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CreateWorkingBranchService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/CreateWorkingBranchService.java
@@ -17,8 +17,8 @@ import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.util.AtsBranchManager;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.plugin.util.Result;
@@ -71,7 +71,7 @@ public class CreateWorkingBranchService extends WorkPageService implements IBran
             }
          });
 
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       refresh();
    }
 
@@ -151,6 +151,6 @@ public class CreateWorkingBranchService extends WorkPageService implements IBran
     */
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/DeleteWorkingBranch.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/DeleteWorkingBranch.java
index 3429969e21e..d9999d027fe 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/DeleteWorkingBranch.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/DeleteWorkingBranch.java
@@ -17,8 +17,8 @@ import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.util.AtsBranchManager;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
@@ -68,7 +68,7 @@ public class DeleteWorkingBranch extends WorkPageService implements IBranchEvent
                smaMgr.getBranchMgr().deleteEmptyWorkingBranch();
             }
          });
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       refresh();
    }
 
@@ -143,6 +143,6 @@ public class DeleteWorkingBranch extends WorkPageService implements IBranchEvent
     */
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/SetAsDefaultBranchService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/SetAsDefaultBranchService.java
index ff59ac0877c..3476801226f 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/SetAsDefaultBranchService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/SetAsDefaultBranchService.java
@@ -16,8 +16,8 @@ import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.util.AtsBranchManager;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
@@ -67,7 +67,7 @@ public class SetAsDefaultBranchService extends WorkPageService implements IBranc
          }
       });
 
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       refresh();
    }
 
@@ -122,7 +122,7 @@ public class SetAsDefaultBranchService extends WorkPageService implements IBranc
     */
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportService.java
index 6dd8e589bf7..cd03c3fa0c3 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportService.java
@@ -17,8 +17,8 @@ import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.util.AtsBranchManager;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
@@ -68,7 +68,7 @@ public class ShowChangeReportService extends WorkPageService implements IBranchE
             performService();
          }
       });
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       refresh();
    }
 
@@ -87,7 +87,7 @@ public class ShowChangeReportService extends WorkPageService implements IBranchE
       };
       toolBarAction.setToolTipText(getName());
       toolBarAction.setImageDescriptor(SkynetGuiPlugin.getInstance().getImageDescriptor("branch_change.gif"));
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       refresh();
       return toolBarAction;
    }
@@ -95,7 +95,7 @@ public class ShowChangeReportService extends WorkPageService implements IBranchE
    @Override
    public void dispose() {
       super.dispose();
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarServiceOld.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarServiceOld.java
index 33a15a36495..c831a1e1e66 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarServiceOld.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowChangeReportToolbarServiceOld.java
@@ -16,8 +16,8 @@ import org.eclipse.osee.ats.editor.SMAManager;
 import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
@@ -50,7 +50,7 @@ public class ShowChangeReportToolbarServiceOld extends WorkPageService implement
       toolBarAction.setToolTipText(getName());
       toolBarAction.setImageDescriptor(SkynetGuiPlugin.getInstance().getImageDescriptor("branch_change.gif"));
 
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       refresh();
       return toolBarAction;
    }
@@ -99,7 +99,7 @@ public class ShowChangeReportToolbarServiceOld extends WorkPageService implement
     */
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowMergeManagerService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowMergeManagerService.java
index eab31fb20bd..10f2df5328e 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowMergeManagerService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowMergeManagerService.java
@@ -17,8 +17,8 @@ import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.util.AtsBranchManager;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
@@ -69,7 +69,7 @@ public class ShowMergeManagerService extends WorkPageService implements IBranchE
          }
       });
 
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       refresh();
    }
 
@@ -86,7 +86,7 @@ public class ShowMergeManagerService extends WorkPageService implements IBranchE
       toolBarAction.setToolTipText(getName());
       toolBarAction.setImageDescriptor(SkynetGuiPlugin.getInstance().getImageDescriptor("branch_merge.gif"));
 
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       refresh();
       return toolBarAction;
    }
@@ -141,7 +141,7 @@ public class ShowMergeManagerService extends WorkPageService implements IBranchE
     */
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowWorkingBranchService.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowWorkingBranchService.java
index f429a4685cd..46669ae30db 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowWorkingBranchService.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/service/branch/ShowWorkingBranchService.java
@@ -16,8 +16,8 @@ import org.eclipse.osee.ats.editor.service.WorkPageService;
 import org.eclipse.osee.ats.util.AtsBranchManager;
 import org.eclipse.osee.ats.workflow.AtsWorkPage;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.skynet.XFormToolkit;
@@ -65,7 +65,7 @@ public class ShowWorkingBranchService extends WorkPageService implements IBranch
          }
       });
 
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       refresh();
    }
 
@@ -106,7 +106,7 @@ public class ShowWorkingBranchService extends WorkPageService implements IBranch
     */
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java
index 2332b449519..75f405b760a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java
@@ -23,9 +23,9 @@ import org.eclipse.osee.ats.config.BulkLoadAtsCache;
 import org.eclipse.osee.ats.editor.SMAEditor;
 import org.eclipse.osee.ats.util.AtsLib;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -77,7 +77,7 @@ public class ActionHyperView extends HyperView implements IPartListener, IAction
       OseeAts.addBugToViewToolbar(this, this, AtsPlugin.getInstance(), VIEW_ID, "SkyWalker");
       AtsPlugin.getInstance().setHelp(top, HELP_CONTEXT_ID);
       AtsPlugin.getInstance().setHelp(composite, HELP_CONTEXT_ID);
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    public static ActionHyperView getArtifactHyperView() {
@@ -100,7 +100,7 @@ public class ActionHyperView extends HyperView implements IPartListener, IAction
    @Override
    public void dispose() {
       super.dispose();
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    @Override
@@ -123,12 +123,12 @@ public class ActionHyperView extends HyperView implements IPartListener, IAction
    @Override
    public void display() {
       try {
-         XEventManager.removeListeners(this);
+         OseeEventManager.removeListeners(this);
          getContainer().setCursor(new Cursor(null, SWT.NONE));
          if (currentArtifact == null || currentArtifact.isDeleted()) {
             return;
          }
-         XEventManager.addListener(this, this);
+         OseeEventManager.addListener(this, this);
          reviewsCreated = false;
          tasksReviewsCreated = false;
          ATSArtifact topArt = getTopArtifact(currentArtifact);
@@ -165,7 +165,7 @@ public class ActionHyperView extends HyperView implements IPartListener, IAction
          create(topAHI);
       } catch (Exception ex) {
          clear();
-         XEventManager.removeListeners(this);
+         OseeEventManager.removeListeners(this);
       }
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionSkyWalker.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionSkyWalker.java
index e5181fe2de2..9f31237745f 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionSkyWalker.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionSkyWalker.java
@@ -22,9 +22,9 @@ import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.editor.SMAEditor;
 import org.eclipse.osee.framework.skynet.core.User;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin;
@@ -65,7 +65,7 @@ public class ActionSkyWalker extends SkyWalkerView implements IPartListener, IAc
       super.createPartControl(parent);
 
       sashForm.setWeights(new int[] {99, 1});
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    /*
@@ -94,7 +94,7 @@ public class ActionSkyWalker extends SkyWalkerView implements IPartListener, IAc
    @Override
    public void dispose() {
       super.dispose();
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    /*
@@ -104,7 +104,7 @@ public class ActionSkyWalker extends SkyWalkerView implements IPartListener, IAc
     */
    @Override
    public void explore(Artifact artifact) {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
       if (artifact == null || artifact.isDeleted() || (!(artifact instanceof ATSArtifact))) clear();
       try {
          getOptions().setArtifact(artifact);
@@ -113,10 +113,10 @@ public class ActionSkyWalker extends SkyWalkerView implements IPartListener, IAc
             super.explore(artifact);
          else
             super.explore(getTopArtifact((ATSArtifact) artifact));
-         XEventManager.addListener(this, this);
+         OseeEventManager.addListener(this, this);
       } catch (SQLException ex) {
          clear();
-         XEventManager.removeListeners(this);
+         OseeEventManager.removeListeners(this);
       }
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java
index f869020f8eb..144a976b980 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ArtifactHyperView.java
@@ -26,9 +26,9 @@ import org.eclipse.osee.ats.actions.wizard.ArtifactSelectWizard;
 import org.eclipse.osee.ats.editor.SMAEditor;

 import org.eclipse.osee.ats.world.search.MultipleHridSearchItem;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;

-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;

+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.relation.RelationLink;

 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;

@@ -108,9 +108,9 @@ public class ArtifactHyperView extends HyperView implements IFrameworkTransactio
    @Override

    public void display() {

       try {

-         XEventManager.removeListeners(this);

+         OseeEventManager.removeListeners(this);

          if (currentArtifact == null) return;

-         XEventManager.addListener(this, this);

+         OseeEventManager.addListener(this, this);

          topAHI = new ArtifactHyperItem(currentArtifact);

          // System.out.println("Artifact "+currentArtifact.getArtifactTypeNameShort());

          int x = 0;

@@ -167,10 +167,10 @@ public class ArtifactHyperView extends HyperView implements IFrameworkTransactio
          center();

       } catch (SQLException ex) {

          clear();

-         XEventManager.removeListeners(this);

+         OseeEventManager.removeListeners(this);

       } catch (ArtifactDoesNotExist ex) {

          clear();

-         XEventManager.removeListeners(this);

+         OseeEventManager.removeListeners(this);

       }

    }

 

@@ -182,7 +182,7 @@ public class ArtifactHyperView extends HyperView implements IFrameworkTransactio
    @Override

    public void dispose() {

       super.dispose();

-      XEventManager.removeListeners(this);

+      OseeEventManager.removeListeners(this);

    }

 

    public void handleWindowChange() {

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchAccessHandler.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchAccessHandler.java
index c80e047aa6e..e3e7a5c5056 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchAccessHandler.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsBranchAccessHandler.java
@@ -18,8 +18,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.Branch;

 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;

 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;

-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.BranchDoesNotExist;

 import org.eclipse.osee.framework.ui.plugin.event.Sender;

 import org.eclipse.osee.framework.ui.skynet.util.OSEELog;

@@ -39,11 +39,11 @@ public class AtsBranchAccessHandler implements IBranchEventListener {
 

    private AtsBranchAccessHandler() {

       OSEELog.logInfo(AtsPlugin.class, "Starting ATS Branch Access Handler", false);

-      XEventManager.addListener(this, this);

+      OseeEventManager.addListener(this, this);

    }

 

    public void dispose() {

-      XEventManager.removeListeners(this);

+      OseeEventManager.removeListeners(this);

    }

 

    /* (non-Javadoc)

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPreSaveCacheRemoteEventHandler.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPreSaveCacheRemoteEventHandler.java
index 5152b8604e5..d544c753fa9 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPreSaveCacheRemoteEventHandler.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsPreSaveCacheRemoteEventHandler.java
@@ -13,9 +13,9 @@ package org.eclipse.osee.ats.util;
 import org.eclipse.osee.ats.AtsPlugin;

 import org.eclipse.osee.ats.artifact.StateMachineArtifact;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;

-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;

+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;

 import org.eclipse.osee.framework.ui.skynet.util.OSEELog;

 

@@ -35,11 +35,11 @@ public class AtsPreSaveCacheRemoteEventHandler implements IFrameworkTransactionE
 

    private AtsPreSaveCacheRemoteEventHandler() {

       OSEELog.logInfo(AtsPlugin.class, "Starting ATS Pre-Save Remote Event Handler", false);

-      XEventManager.addListener(this, this);

+      OseeEventManager.addListener(this, this);

    }

 

    public void dispose() {

-      XEventManager.removeListeners(this);

+      OseeEventManager.removeListeners(this);

    }

 

    /* (non-Javadoc)

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java
index 046bf51af65..7fb9eeca953 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/defect/XDefectViewer.java
@@ -26,9 +26,9 @@ import org.eclipse.osee.ats.util.widgets.defect.DefectItem.Severity;
 import org.eclipse.osee.framework.jdk.core.util.AHTML;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.transaction.AbstractSkynetTxTemplate;
 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
@@ -79,7 +79,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IFramewor
     */
    public XDefectViewer() {
       super("Defects");
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    /*
@@ -353,7 +353,7 @@ public class XDefectViewer extends XWidget implements IArtifactWidget, IFramewor
 
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
       xViewer.dispose();
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java
index a34e3f5b821..5b03fe32838 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/widgets/role/XUserRoleViewer.java
@@ -24,9 +24,9 @@ import org.eclipse.osee.ats.artifact.IReviewArtifact;
 import org.eclipse.osee.framework.jdk.core.util.AHTML;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.transaction.AbstractSkynetTxTemplate;
 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
@@ -70,7 +70,7 @@ public class XUserRoleViewer extends XWidget implements IArtifactWidget, IFramew
    public XUserRoleViewer() {
       super("Roles");
 
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    /*
@@ -286,7 +286,7 @@ public class XUserRoleViewer extends XWidget implements IArtifactWidget, IFramew
 
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
 
       xViewer.dispose();
    }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldView.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldView.java
index 571c21c4f8b..ea555ed08a4 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldView.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldView.java
@@ -53,9 +53,9 @@ import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTransfer;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -293,7 +293,7 @@ public class WorldView extends ViewPart implements IFrameworkTransactionEventLis
       SkynetContributionItem.addTo(this, false);
       setupDragAndDropSupport();
 
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
 
    }
 
@@ -684,7 +684,7 @@ public class WorldView extends ViewPart implements IFrameworkTransactionEventLis
    @Override
    public void dispose() {
       super.dispose();
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
       if (xViewer != null) xViewer.dispose();
    }
 
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java
index 912c158fcc5..6ce5ae5312e 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewer.java
@@ -48,11 +48,11 @@ import org.eclipse.osee.ats.util.Subscribe;
 import org.eclipse.osee.framework.jdk.core.util.AHTML;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactsChangeTypeEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactsPurgedEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IArtifactsChangeTypeEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IArtifactsPurgedEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.MultipleAttributesExist;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.transaction.AbstractSkynetTxTemplate;
@@ -111,7 +111,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen
             handleDoubleClick();
          };
       });
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    @Override
@@ -551,7 +551,7 @@ public class WorldXViewer extends XViewer implements IArtifactsPurgedEventListen
       // Dispose of the table objects is done through separate dispose listener off tree
       // Tell the label provider to release its ressources
       getLabelProvider().dispose();
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    public ArrayList<Artifact> getSelectedArtifacts() {
diff --git a/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/ChangeArtifactType.java b/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/ChangeArtifactType.java
index c2939d802dd..56b708cf8e0 100644
--- a/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/ChangeArtifactType.java
+++ b/org.eclipse.osee.define/src/org/eclipse/osee/define/blam/operation/ChangeArtifactType.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;
 import org.eclipse.osee.framework.skynet.core.attribute.Attribute;

 import org.eclipse.osee.framework.skynet.core.attribute.AttributeType;

 import org.eclipse.osee.framework.skynet.core.attribute.ConfigurationPersistenceManager;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.relation.RelationLink;

 import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;

 import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts;

@@ -71,7 +71,7 @@ public class ChangeArtifactType extends AbstractBlam {
 

       // Kick Local and Remote Events

       Sender sender = new Sender(Source.Local, this, SkynetAuthentication.getUser().getArtId());

-      XEventManager.kickArtifactsChangeTypeEvent(sender, descriptor.getArtTypeId(), new LoadedArtifacts(artifacts));

+      OseeEventManager.kickArtifactsChangeTypeEvent(sender, descriptor.getArtTypeId(), new LoadedArtifacts(artifacts));

    }

 

    /**

diff --git a/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF b/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
index 6408829ec1f..a317b6a19d7 100644
--- a/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF
@@ -30,7 +30,7 @@ Export-Package: org.eclipse.osee.framework.skynet.core,
  org.eclipse.osee.framework.skynet.core.change,

  org.eclipse.osee.framework.skynet.core.conflict,

  org.eclipse.osee.framework.skynet.core.dbinit,

- org.eclipse.osee.framework.skynet.core.eventx,

+ org.eclipse.osee.framework.skynet.core.event,

  org.eclipse.osee.framework.skynet.core.exception,

  org.eclipse.osee.framework.skynet.core.exportImport,

  org.eclipse.osee.framework.skynet.core.httpRequests,

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SkynetAuthentication.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SkynetAuthentication.java
index 5d3f1f60e9d..3f88a0b9bf0 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SkynetAuthentication.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/SkynetAuthentication.java
@@ -28,8 +28,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.eclipse.osee.framework.skynet.core.dbinit.SkynetDbInit;
-import org.eclipse.osee.framework.skynet.core.eventx.AccessControlModType;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.AccessControlModType;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.exception.UserInDatabaseMultipleTimes;
@@ -156,7 +156,7 @@ public class SkynetAuthentication {
          public void run() {
             try {
                Sender sender = new Sender(Source.Local, this, SkynetAuthentication.getUser().getArtId());
-               XEventManager.kickAccessControlArtifactsEvent(sender, AccessControlModType.UserAuthenticated, null);
+               OseeEventManager.kickAccessControlArtifactsEvent(sender, AccessControlModType.UserAuthenticated, null);
             } catch (Exception ex) {
                SkynetActivator.getLogger().log(Level.SEVERE, ex.getLocalizedMessage(), ex);
             }
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java
index 1a9aed3463e..4f0b4117880 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/access/AccessControlManager.java
@@ -36,8 +36,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
 import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.eventx.AccessControlModType;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.AccessControlModType;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.BranchDoesNotExist;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;
@@ -705,7 +705,7 @@ public class AccessControlManager {
 
          Sender sender = new Sender(Source.Local, this, SkynetAuthentication.getUser().getArtId());
          try {
-            XEventManager.kickAccessControlArtifactsEvent(sender, AccessControlModType.ArtifactsLocked,
+            OseeEventManager.kickAccessControlArtifactsEvent(sender, AccessControlModType.ArtifactsLocked,
                   new LoadedArtifacts(object));
          } catch (Exception ex) {
             SkynetActivator.getLogger().log(Level.SEVERE, ex.getLocalizedMessage(), ex);
@@ -729,7 +729,7 @@ public class AccessControlManager {
 
             Sender sender = new Sender(Source.Local, this, SkynetAuthentication.getUser().getArtId());
             try {
-               XEventManager.kickAccessControlArtifactsEvent(sender, AccessControlModType.ArtifactsUnlocked,
+               OseeEventManager.kickAccessControlArtifactsEvent(sender, AccessControlModType.ArtifactsUnlocked,
                      new LoadedArtifacts(object));
             } catch (Exception ex) {
                SkynetActivator.getLogger().log(Level.SEVERE, ex.getLocalizedMessage(), ex);
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
index ee237aa71e2..90160aedab8 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact.java
@@ -50,7 +50,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.CharacterBackedAttribute
 import org.eclipse.osee.framework.skynet.core.attribute.ConfigurationPersistenceManager;

 import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;

 import org.eclipse.osee.framework.skynet.core.change.ModificationType;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.exception.AttributeDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.exception.BranchDoesNotExist;

@@ -929,7 +929,7 @@ public class Artifact implements IAdaptable, Comparable<Artifact> {
       // Kick Local Event

       try {

          Sender sender = new Sender(Source.Local, this, SkynetAuthentication.getUser().getArtId());

-         XEventManager.kickArtifactModifiedEvent(sender, ArtifactModType.Reverted, this);

+         OseeEventManager.kickArtifactModifiedEvent(sender, ArtifactModType.Reverted, this);

       } catch (Exception ex) {

          SkynetActivator.getLogger().log(Level.SEVERE, ex.getLocalizedMessage(), ex);

       }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java
index 9f600af5c6b..b9459ac380a 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/ArtifactPersistenceManager.java
@@ -55,7 +55,7 @@ import org.eclipse.osee.framework.skynet.core.attribute.Attribute;
 import org.eclipse.osee.framework.skynet.core.attribute.AttributeToTransactionOperation;

 import org.eclipse.osee.framework.skynet.core.change.ModificationType;

 import org.eclipse.osee.framework.skynet.core.change.TxChange;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.exception.MultipleArtifactsExist;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

@@ -938,7 +938,7 @@ public class ArtifactPersistenceManager {
          Sender sender =

                new Sender(Source.Local, ArtifactPersistenceManager.getInstance(),

                      SkynetAuthentication.getUser().getArtId());

-         XEventManager.kickArtifactsPurgedEvent(sender, new LoadedArtifacts(artifactsToPurge));

+         OseeEventManager.kickArtifactsPurgedEvent(sender, new LoadedArtifacts(artifactsToPurge));

 

       } finally {

          ArtifactLoader.clearQuery(queryId);

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Branch.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Branch.java
index 63b800b552c..ab5d452bf28 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Branch.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/Branch.java
@@ -28,7 +28,7 @@ import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.SkynetActivator;

 import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;

 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.exception.BranchDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.exception.MultipleArtifactsExist;

@@ -140,7 +140,7 @@ public class Branch implements Comparable<Branch>, IAdaptable {
    }

 

    private void kickRenameEvents() throws OseeCoreException {

-      XEventManager.kickBranchEvent(XEventManager.getSender(Source.Local, this), BranchModType.Renamed, branchId);

+      OseeEventManager.kickBranchEvent(OseeEventManager.getSender(Source.Local, this), BranchModType.Renamed, branchId);

    }

 

    /**

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/CommitJob.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/CommitJob.java
index 933acb852ed..ced42fc734a 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/CommitJob.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/CommitJob.java
@@ -30,7 +30,7 @@ import org.eclipse.osee.framework.skynet.core.change.ModificationType;
 import org.eclipse.osee.framework.skynet.core.change.TxChange;

 import org.eclipse.osee.framework.skynet.core.conflict.Conflict;

 import org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ConflictDetectionException;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.skynet.core.transaction.TransactionDetailsType;

@@ -240,7 +240,7 @@ class CommitJob extends Job {
          super.handleTxFinally();

          if (success) {

             Sender sender = new Sender(Source.Local, this, SkynetAuthentication.getUser().getArtId());

-            XEventManager.kickBranchEvent(sender, BranchModType.Committed, fromBranchId);

+            OseeEventManager.kickBranchEvent(sender, BranchModType.Committed, fromBranchId);

          }

       }

 

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteBranchJob.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteBranchJob.java
index 923ef38b03c..2848e0850e8 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteBranchJob.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteBranchJob.java
@@ -32,7 +32,7 @@ import org.eclipse.osee.framework.db.connection.core.schema.SkynetDatabase;
 import org.eclipse.osee.framework.db.connection.core.schema.Table;
 import org.eclipse.osee.framework.db.connection.core.transaction.AbstractDbTxTemplate;
 import org.eclipse.osee.framework.skynet.core.SkynetActivator;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
 
@@ -148,7 +148,7 @@ class DeleteBranchJob extends Job {
          super.handleTxFinally();
          monitor.done();
          if (getResult().equals(Status.OK_STATUS)) {
-            XEventManager.kickBranchEvent(XEventManager.getSender(Source.Local, this), BranchModType.Deleted,
+            OseeEventManager.kickBranchEvent(OseeEventManager.getSender(Source.Local, this), BranchModType.Deleted,
                   branch.getBranchId());
          }
       }
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteTransactionJob.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteTransactionJob.java
index 43891822635..655b763190a 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteTransactionJob.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/DeleteTransactionJob.java
@@ -30,7 +30,7 @@ import org.eclipse.osee.framework.db.connection.core.transaction.DbTransaction;
 import org.eclipse.osee.framework.jdk.core.type.HashCollection;

 import org.eclipse.osee.framework.skynet.core.SkynetActivator;

 import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.skynet.core.exception.TransactionDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.transaction.TransactionId;

@@ -119,7 +119,7 @@ public class DeleteTransactionJob extends Job {
 

          // Kick Local and Remote Events

          Sender sender = new Sender(Source.Local, this, SkynetAuthentication.getUser().getArtId());

-         XEventManager.kickTransactionsDeletedEvent(sender, txIdsToDelete);

+         OseeEventManager.kickTransactionsDeletedEvent(sender, txIdsToDelete);

       } catch (Exception ex) {

          returnStatus = new Status(Status.ERROR, SkynetActivator.PLUGIN_ID, -1, ex.getLocalizedMessage(), ex);

       } finally {

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpBranchCreation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpBranchCreation.java
index 2c074289c7c..64a6984801f 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpBranchCreation.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/HttpBranchCreation.java
@@ -23,7 +23,7 @@ import org.eclipse.osee.framework.jdk.core.util.OseeApplicationServerContext;
 import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;

 import org.eclipse.osee.framework.skynet.core.User;

 import org.eclipse.osee.framework.skynet.core.dbinit.SkynetDbInit;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.skynet.core.linking.HttpUrlBuilder;

 import org.eclipse.osee.framework.skynet.core.transaction.TransactionId;

@@ -108,7 +108,7 @@ public class HttpBranchCreation {
 

       // Kick events

       Sender sender = new Sender(Source.Local, HttpBranchCreation.class, SkynetAuthentication.getUser().getArtId());

-      XEventManager.kickBranchEvent(sender, BranchModType.Added, branch.getBranchId());

+      OseeEventManager.kickBranchEvent(sender, BranchModType.Added, branch.getBranchId());

 

       return branch;

    }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RemoteEventManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RemoteEventManager.java
index 3dc2b33d4e0..74dceb890e3 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RemoteEventManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/RemoteEventManager.java
@@ -62,13 +62,13 @@ import org.eclipse.osee.framework.skynet.core.SkynetActivator;
 import org.eclipse.osee.framework.skynet.core.attribute.Attribute;

 import org.eclipse.osee.framework.skynet.core.attribute.AttributeToTransactionOperation;

 import org.eclipse.osee.framework.skynet.core.attribute.AttributeTypeManager;

-import org.eclipse.osee.framework.skynet.core.eventx.AccessControlModType;

-import org.eclipse.osee.framework.skynet.core.eventx.BroadcastEventType;

-import org.eclipse.osee.framework.skynet.core.eventx.RemoteEventModType;

-import org.eclipse.osee.framework.skynet.core.eventx.XArtifactModifiedEvent;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

-import org.eclipse.osee.framework.skynet.core.eventx.XModifiedEvent;

-import org.eclipse.osee.framework.skynet.core.eventx.XRelationModifiedEvent;

+import org.eclipse.osee.framework.skynet.core.event.AccessControlModType;

+import org.eclipse.osee.framework.skynet.core.event.BroadcastEventType;

+import org.eclipse.osee.framework.skynet.core.event.RemoteEventModType;

+import org.eclipse.osee.framework.skynet.core.event.ArtifactModifiedEvent;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

+import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;

+import org.eclipse.osee.framework.skynet.core.event.RelationModifiedEvent;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.skynet.core.relation.RelationLink;

@@ -178,7 +178,7 @@ public class RemoteEventManager implements IServiceLookupListener {
       try {

          logger.log(Level.INFO, "Skynet Event Service connection established " + ACCEPTABLE_SERVICE);

          skynetEventService.register(myReference);

-         XEventManager.kickRemoteEventManagerEvent(XEventManager.getSender(Source.Local, this),

+         OseeEventManager.kickRemoteEventManagerEvent(OseeEventManager.getSender(Source.Local, this),

                RemoteEventModType.Connected);

 

       } catch (OseeCoreException e) {

@@ -194,7 +194,7 @@ public class RemoteEventManager implements IServiceLookupListener {
       logger.log(Level.WARNING, "Skynet Event Service connection lost\n" + e.toString(), e);

       skynetEventService = null;

       try {

-         XEventManager.kickRemoteEventManagerEvent(XEventManager.getSender(Source.Local, this),

+         OseeEventManager.kickRemoteEventManagerEvent(OseeEventManager.getSender(Source.Local, this),

                RemoteEventModType.DisConnected);

 

       } catch (OseeCoreException ex) {

@@ -238,7 +238,7 @@ public class RemoteEventManager implements IServiceLookupListener {
       @Override

       public void onEvent(final ISkynetEvent[] events) throws RemoteException {

 

-         final List<XModifiedEvent> xModifiedEvents = new LinkedList<XModifiedEvent>();

+         final List<ArtifactTransactionModifiedEvent> xModifiedEvents = new LinkedList<ArtifactTransactionModifiedEvent>();

          Job job = new Job("Receive Event") {

 

             @Override

@@ -257,7 +257,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                               new LoadedArtifacts(((NetworkAccessControlArtifactsEvent) event).getBranchId(),

                                     ((NetworkAccessControlArtifactsEvent) event).getArtifactIds(),

                                     ((NetworkAccessControlArtifactsEvent) event).getArtifactTypeIds());

-                        XEventManager.kickAccessControlArtifactsEvent(sender, accessControlModType, loadedArtifacts);

+                        OseeEventManager.kickAccessControlArtifactsEvent(sender, accessControlModType, loadedArtifacts);

                      } catch (Exception ex) {

                         logger.log(Level.SEVERE, ex.toString(), ex);

                      }

@@ -270,7 +270,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                         try {

                            Sender sender =

                                  new Sender(Source.Remote, null, ((NetworkRenameBranchEvent) event).getAuthor());

-                           XEventManager.kickBranchEvent(sender, BranchModType.Renamed, branchId);

+                           OseeEventManager.kickBranchEvent(sender, BranchModType.Renamed, branchId);

                         } catch (Exception ex) {

                            logger.log(Level.SEVERE, ex.toString(), ex);

                         }

@@ -281,7 +281,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                      int branchId = ((NetworkNewBranchEvent) event).getBranchId();

                      try {

                         Sender sender = new Sender(Source.Remote, null, ((NetworkNewBranchEvent) event).getAuthor());

-                        XEventManager.kickBranchEvent(sender, BranchModType.Added, branchId);

+                        OseeEventManager.kickBranchEvent(sender, BranchModType.Added, branchId);

                      } catch (Exception ex) {

                         logger.log(Level.SEVERE, ex.toString(), ex);

                      }

@@ -291,7 +291,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                      try {

                         Sender sender =

                               new Sender(Source.Remote, null, ((NetworkDeletedBranchEvent) event).getAuthor());

-                        XEventManager.kickBranchEvent(sender, BranchModType.Deleted, branchId);

+                        OseeEventManager.kickBranchEvent(sender, BranchModType.Deleted, branchId);

                      } catch (Exception ex) {

                         logger.log(Level.SEVERE, ex.toString(), ex);

                      }

@@ -300,7 +300,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                      BranchPersistenceManager.removeBranchFromCache(branchId);

                      try {

                         Sender sender = new Sender(Source.Remote, null, ((NetworkCommitBranchEvent) event).getAuthor());

-                        XEventManager.kickBranchEvent(sender, BranchModType.Committed, branchId);

+                        OseeEventManager.kickBranchEvent(sender, BranchModType.Committed, branchId);

                      } catch (Exception ex) {

                         logger.log(Level.SEVERE, ex.toString(), ex);

                      }

@@ -315,7 +315,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                                  "Unknown broadcast event type \"" + ((NetworkBroadcastEvent) event).getBroadcastEventTypeName() + "\"",

                                  new IllegalArgumentException());

                         } else {

-                           XEventManager.kickBroadcastEvent(sender, broadcastEventType,

+                           OseeEventManager.kickBroadcastEvent(sender, broadcastEventType,

                                  ((NetworkBroadcastEvent) event).getUserIds(),

                                  ((NetworkBroadcastEvent) event).getMessage());

                         }

@@ -334,7 +334,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                               new LoadedArtifacts(((NetworkArtifactChangeTypeEvent) event).getBranchId(),

                                     ((NetworkArtifactChangeTypeEvent) event).getArtifactIds(),

                                     ((NetworkArtifactChangeTypeEvent) event).getArtifactTypeIds());

-                        XEventManager.kickArtifactsChangeTypeEvent(sender,

+                        OseeEventManager.kickArtifactsChangeTypeEvent(sender,

                               ((NetworkArtifactChangeTypeEvent) event).getToArtifactTypeId(), loadedArtifacts);

                      } catch (Exception ex) {

                         logger.log(Level.SEVERE, ex.toString(), ex);

@@ -347,7 +347,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                               new LoadedArtifacts(((NetworkArtifactPurgeEvent) event).getBranchId(),

                                     ((NetworkArtifactPurgeEvent) event).getArtifactIds(),

                                     ((NetworkArtifactChangeTypeEvent) event).getArtifactTypeIds());

-                        XEventManager.kickArtifactsPurgedEvent(sender, loadedArtifacts);

+                        OseeEventManager.kickArtifactsPurgedEvent(sender, loadedArtifacts);

                      } catch (Exception ex) {

                         logger.log(Level.SEVERE, ex.toString(), ex);

                      }

@@ -355,7 +355,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                      try {

                         Sender sender =

                               new Sender(Source.Remote, null, ((NetworkTransactionDeletedEvent) event).getAuthor());

-                        XEventManager.kickTransactionsDeletedEvent(sender,

+                        OseeEventManager.kickTransactionsDeletedEvent(sender,

                               ((NetworkTransactionDeletedEvent) event).getTransactionIds());

                      } catch (Exception ex) {

                         logger.log(Level.SEVERE, ex.toString(), ex);

@@ -363,7 +363,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                   }

                }

 

-               XEventManager.kickTransactionEvent(Source.Remote, xModifiedEvents);

+               OseeEventManager.kickTransactionEvent(Source.Remote, xModifiedEvents);

                return Status.OK_STATUS;

             }

          };

@@ -379,7 +379,7 @@ public class RemoteEventManager implements IServiceLookupListener {
     * 

     * @param event

     */

-   private static void updateArtifacts(ISkynetArtifactEvent event, Collection<XModifiedEvent> xModifiedEvents) {

+   private static void updateArtifacts(ISkynetArtifactEvent event, Collection<ArtifactTransactionModifiedEvent> xModifiedEvents) {

       if (event == null) return;

 

       try {

@@ -393,7 +393,7 @@ public class RemoteEventManager implements IServiceLookupListener {
             if (artifact == null) {

                Sender sender = new Sender(Source.Remote, instance, ((NetworkArtifactModifiedEvent) event).getAuthor());

                UnloadedArtifact unloadedArtifact = new UnloadedArtifact(branchId, artId, artTypeId);

-               xModifiedEvents.add(new XArtifactModifiedEvent(sender, ArtifactModType.Changed, unloadedArtifact));

+               xModifiedEvents.add(new ArtifactModifiedEvent(sender, ArtifactModType.Changed, unloadedArtifact));

             } else if (!artifact.isHistorical()) {

                for (SkynetAttributeChange skynetAttributeChange : ((NetworkArtifactModifiedEvent) event).getAttributeChanges()) {

                   boolean attributeNeedsCreation = true;

@@ -425,7 +425,7 @@ public class RemoteEventManager implements IServiceLookupListener {
                }

 

                Sender sender = new Sender(Source.Remote, instance, ((NetworkArtifactModifiedEvent) event).getAuthor());

-               xModifiedEvents.add(new XArtifactModifiedEvent(sender, ArtifactModType.Changed, artifact,

+               xModifiedEvents.add(new ArtifactModifiedEvent(sender, ArtifactModType.Changed, artifact,

                      ((NetworkArtifactModifiedEvent) event).getTransactionId(),

                      ((NetworkArtifactModifiedEvent) event).getAttributeChanges()));

 

@@ -436,13 +436,13 @@ public class RemoteEventManager implements IServiceLookupListener {
             if (artifact == null) {

                Sender sender = new Sender(Source.Remote, instance, ((NetworkArtifactDeletedEvent) event).getAuthor());

                UnloadedArtifact unloadedArtifact = new UnloadedArtifact(branchId, artId, artTypeId);

-               xModifiedEvents.add(new XArtifactModifiedEvent(sender, ArtifactModType.Deleted, unloadedArtifact));

+               xModifiedEvents.add(new ArtifactModifiedEvent(sender, ArtifactModType.Deleted, unloadedArtifact));

             } else if (!artifact.isHistorical()) {

                artifact.setDeleted();

                artifact.setNotDirty();

 

                Sender sender = new Sender(Source.Remote, instance, ((NetworkArtifactDeletedEvent) event).getAuthor());

-               xModifiedEvents.add(new XArtifactModifiedEvent(sender, ArtifactModType.Deleted, artifact,

+               xModifiedEvents.add(new ArtifactModifiedEvent(sender, ArtifactModType.Deleted, artifact,

                      ((NetworkArtifactDeletedEvent) event).getTransactionId(), new ArrayList<SkynetAttributeChange>()));

             }

          }

@@ -457,7 +457,7 @@ public class RemoteEventManager implements IServiceLookupListener {
     * @throws ArtifactDoesNotExist

     * @throws SQLException

     */

-   private static void updateRelations(ISkynetRelationLinkEvent event, Collection<XModifiedEvent> xModifiedEvents) {

+   private static void updateRelations(ISkynetRelationLinkEvent event, Collection<ArtifactTransactionModifiedEvent> xModifiedEvents) {

       if (event == null) return;

 

       try {

@@ -475,20 +475,20 @@ public class RemoteEventManager implements IServiceLookupListener {
                UnloadedRelation unloadedRelation =

                      new UnloadedRelation(branch.getBranchId(), event.getArtAId(), event.getArtATypeId(),

                            event.getArtBId(), event.getArtBTypeId(), event.getRelTypeId());

-               xModifiedEvents.add(new XRelationModifiedEvent(sender, RelationModType.Deleted, unloadedRelation));

+               xModifiedEvents.add(new RelationModifiedEvent(sender, RelationModType.Deleted, unloadedRelation));

             } else if (event instanceof NetworkRelationLinkModifiedEvent) {

                Sender sender =

                      new Sender(Source.Remote, instance, ((NetworkRelationLinkModifiedEvent) event).getAuthor());

                UnloadedRelation unloadedRelation =

                      new UnloadedRelation(branch.getBranchId(), event.getArtAId(), event.getArtATypeId(),

                            event.getArtBId(), event.getArtBTypeId(), event.getRelTypeId());

-               xModifiedEvents.add(new XRelationModifiedEvent(sender, RelationModType.Changed, unloadedRelation));

+               xModifiedEvents.add(new RelationModifiedEvent(sender, RelationModType.Changed, unloadedRelation));

             } else if (event instanceof NetworkNewRelationLinkEvent) {

                Sender sender = new Sender(Source.Remote, instance, ((NetworkNewRelationLinkEvent) event).getAuthor());

                UnloadedRelation unloadedRelation =

                      new UnloadedRelation(branch.getBranchId(), event.getArtAId(), event.getArtATypeId(),

                            event.getArtBId(), event.getArtBTypeId(), event.getRelTypeId());

-               xModifiedEvents.add(new XRelationModifiedEvent(sender, RelationModType.Added, unloadedRelation));

+               xModifiedEvents.add(new RelationModifiedEvent(sender, RelationModType.Added, unloadedRelation));

             }

          }

          if (aArtifactLoaded || bArtifactLoaded) {

@@ -532,7 +532,7 @@ public class RemoteEventManager implements IServiceLookupListener {
 

                   Sender sender =

                         new Sender(Source.Remote, instance, ((NetworkRelationLinkModifiedEvent) event).getAuthor());

-                  xModifiedEvents.add(new XRelationModifiedEvent(sender, RelationModType.Changed, relation,

+                  xModifiedEvents.add(new RelationModifiedEvent(sender, RelationModType.Changed, relation,

                         relation.getBranch(), relation.getRelationType().getTypeName(),

                         aOrderChanged ? relation.getASideName() : relation.getBSideName()));

                }

@@ -545,7 +545,7 @@ public class RemoteEventManager implements IServiceLookupListener {
 

                   Sender sender =

                         new Sender(Source.Remote, instance, ((NetworkRelationLinkDeletedEvent) event).getAuthor());

-                  xModifiedEvents.add(new XRelationModifiedEvent(sender, RelationModType.Deleted, relation,

+                  xModifiedEvents.add(new RelationModifiedEvent(sender, RelationModType.Deleted, relation,

                         relation.getBranch(), relation.getRelationType().getTypeName(), ""));

                }

             } else if (event instanceof NetworkNewRelationLinkEvent) {

@@ -573,7 +573,7 @@ public class RemoteEventManager implements IServiceLookupListener {
 

                   Sender sender =

                         new Sender(Source.Remote, instance, ((NetworkRelationLinkDeletedEvent) event).getAuthor());

-                  xModifiedEvents.add(new XRelationModifiedEvent(sender, RelationModType.Added, relation,

+                  xModifiedEvents.add(new RelationModifiedEvent(sender, RelationModType.Added, relation,

                         relation.getBranch(), relation.getRelationType().getTypeName(), ""));

                }

             }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/Attribute.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/Attribute.java
index 651fde280fd..eb1127607c3 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/Attribute.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/attribute/Attribute.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactChecks;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactModType;

 import org.eclipse.osee.framework.skynet.core.artifact.IArtifactCheck;

 import org.eclipse.osee.framework.skynet.core.attribute.providers.IAttributeDataProvider;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.ui.plugin.event.Sender;

 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;

@@ -146,7 +146,7 @@ public abstract class Attribute<T> {
       // Kick Local Event

       try {

          Sender sender = new Sender(Source.Local, this, SkynetAuthentication.getAuthor());

-         XEventManager.kickArtifactModifiedEvent(sender, ArtifactModType.Changed, artifact);

+         OseeEventManager.kickArtifactModifiedEvent(sender, ArtifactModType.Changed, artifact);

       } catch (Exception ex) {

          // do nothing

       }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/AccessControlModType.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/AccessControlModType.java
index ed0b2aca2aa..0a844743716 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/AccessControlModType.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/AccessControlModType.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 /**

  * @author Donald G. Dunne

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/XArtifactModifiedEvent.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/ArtifactModifiedEvent.java
index 2563415d9d5..653607b5a34 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/XArtifactModifiedEvent.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/ArtifactModifiedEvent.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import java.util.Collection;

 import org.eclipse.osee.framework.messaging.event.skynet.event.SkynetAttributeChange;

@@ -15,7 +15,7 @@ import org.eclipse.osee.framework.ui.plugin.event.UnloadedArtifact;
 /**

  * @author Donald G. Dunne

  */

-public class XArtifactModifiedEvent extends XModifiedEvent {

+public class ArtifactModifiedEvent extends ArtifactTransactionModifiedEvent {

 

    protected final Sender sender;

    protected final ArtifactModType artifactModType;

@@ -24,7 +24,7 @@ public class XArtifactModifiedEvent extends XModifiedEvent {
    protected final int transactionNumber;

    protected final Collection<SkynetAttributeChange> dirtySkynetAttributeChanges;

 

-   public XArtifactModifiedEvent(Sender sender, ArtifactModType artifactModType, Artifact artifact, int transactionNumber, Collection<SkynetAttributeChange> dirtySkynetAttributeChanges) {

+   public ArtifactModifiedEvent(Sender sender, ArtifactModType artifactModType, Artifact artifact, int transactionNumber, Collection<SkynetAttributeChange> dirtySkynetAttributeChanges) {

       this.sender = sender;

       this.artifactModType = artifactModType;

       this.artifact = artifact;

@@ -33,7 +33,7 @@ public class XArtifactModifiedEvent extends XModifiedEvent {
       this.unloadedArtifact = null;

    }

 

-   public XArtifactModifiedEvent(Sender sender, ArtifactModType artifactModType, UnloadedArtifact unloadedArtifact) {

+   public ArtifactModifiedEvent(Sender sender, ArtifactModType artifactModType, UnloadedArtifact unloadedArtifact) {

       this.sender = sender;

       this.artifactModType = artifactModType;

       this.unloadedArtifact = unloadedArtifact;

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/XModifiedEvent.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/ArtifactTransactionModifiedEvent.java
index becbb38b251..e14b4d9ae85 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/XModifiedEvent.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/ArtifactTransactionModifiedEvent.java
@@ -3,12 +3,11 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 /**

  * @author Donald G. Dunne

- *

  */

-public class XModifiedEvent {

+public class ArtifactTransactionModifiedEvent {

 

 }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/BranchEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventListener.java
index 7d9793035aa..0f0014c8321 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/BranchEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BranchEventListener.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;

 import org.eclipse.osee.framework.ui.plugin.event.Sender;

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/BroadcastEventType.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BroadcastEventType.java
index 3d795e4e932..31b72d97fc5 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/BroadcastEventType.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/BroadcastEventType.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 /**

  * @author Donald G. Dunne

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/EventType.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/EventType.java
index a6236107270..2c2888de2d1 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/EventType.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/EventType.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 /**

  * @author Donald G. Dunne

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/FrameworkTransactionData.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java
index dd3615fd12b..dbfd35184c7 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/FrameworkTransactionData.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/FrameworkTransactionData.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import java.util.Arrays;

 import java.util.Collection;

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IAccessControlEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IAccessControlEventListener.java
index 94d1e8eb9bd..468f2e80bae 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IAccessControlEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IAccessControlEventListener.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts;

 import org.eclipse.osee.framework.ui.plugin.event.Sender;

@@ -11,7 +11,7 @@ import org.eclipse.osee.framework.ui.plugin.event.Sender;
 /**

  * @author Donald G. Dunne

  */

-public interface IAccessControlEventListener extends IXEventListener {

+public interface IAccessControlEventListener extends IEventListner {

    public void handleAccessControlArtifactsEvent(Sender sender, AccessControlModType accessControlModType, LoadedArtifacts loadedArtifactss);

 

 }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IArtifactModifiedEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IArtifactModifiedEventListener.java
index 58181c8bce5..3dbe58e296a 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IArtifactModifiedEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IArtifactModifiedEventListener.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactModType;

@@ -12,7 +12,7 @@ import org.eclipse.osee.framework.ui.plugin.event.Sender;
 /**

  * @author Donald G. Dunne

  */

-public interface IArtifactModifiedEventListener extends IXEventListener {

+public interface IArtifactModifiedEventListener extends IEventListner {

    public void handleArtifactModifiedEvent(Sender sender, ArtifactModType artifactModType, Artifact artifact);

 

 }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IArtifactsChangeTypeEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IArtifactsChangeTypeEventListener.java
index 07bc64deb95..b2721b3abcb 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IArtifactsChangeTypeEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IArtifactsChangeTypeEventListener.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import java.util.Collection;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

@@ -13,7 +13,7 @@ import org.eclipse.osee.framework.ui.plugin.event.UnloadedArtifact;
 /**

  * @author Donald G. Dunne

  */

-public interface IArtifactsChangeTypeEventListener extends IXEventListener {

+public interface IArtifactsChangeTypeEventListener extends IEventListner {

    public void handleArtifactsChangeTypeEvent(Sender sender, int toArtifactTypeId, Collection<? extends Artifact> cacheArtifacts, Collection<UnloadedArtifact> unloadedArtifacts);

 

 }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IArtifactsPurgedEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IArtifactsPurgedEventListener.java
index f738a67efca..498aca19d57 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IArtifactsPurgedEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IArtifactsPurgedEventListener.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import java.util.Collection;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

@@ -13,7 +13,7 @@ import org.eclipse.osee.framework.ui.plugin.event.UnloadedArtifact;
 /**

  * @author Donald G. Dunne

  */

-public interface IArtifactsPurgedEventListener extends IXEventListener {

+public interface IArtifactsPurgedEventListener extends IEventListner {

    public void handleArtifactsPurgedEvent(Sender sender, Collection<? extends Artifact> cacheArtifacts, Collection<UnloadedArtifact> unloadedArtifacts);

 

 }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IBranchEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IBranchEventListener.java
index fd39da32c76..87290e0a449 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IBranchEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IBranchEventListener.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;

 import org.eclipse.osee.framework.ui.plugin.event.Sender;

@@ -11,7 +11,7 @@ import org.eclipse.osee.framework.ui.plugin.event.Sender;
 /**

  * @author Donald G. Dunne

  */

-public interface IBranchEventListener extends IXEventListener {

+public interface IBranchEventListener extends IEventListner {

    public void handleBranchEvent(Sender sender, BranchModType branchModType, int branchId);

 

    public void handleLocalBranchToArtifactCacheUpdateEvent(Sender sender);

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IBroadcastEventListneer.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IBroadcastEventListneer.java
index 85250429ffd..5d4c77f88f9 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IBroadcastEventListneer.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IBroadcastEventListneer.java
@@ -3,14 +3,14 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.ui.plugin.event.Sender;

 

 /**

  * @author Donald G. Dunne

  */

-public interface IBroadcastEventListneer extends IXEventListener {

+public interface IBroadcastEventListneer extends IEventListner {

    public void handleBroadcastEvent(Sender sender, BroadcastEventType broadcastEventType, String[] userIds, String message);

 

 }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IXEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IEventListner.java
index 384e3a94b59..7eb1fb02363 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IXEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IEventListner.java
@@ -3,11 +3,11 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 /**

  * @author Donald G. Dunne

  */

-public interface IXEventListener {

+public interface IEventListner {

 

 }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IFrameworkTransactionEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IFrameworkTransactionEventListener.java
index 25b471cec3c..fa8cd0572a0 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IFrameworkTransactionEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IFrameworkTransactionEventListener.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;

 

@@ -13,7 +13,7 @@ import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
  * 

  * @author Donald G. Dunne

  */

-public interface IFrameworkTransactionEventListener extends IXEventListener {

+public interface IFrameworkTransactionEventListener extends IEventListner {

 

    /**

     * Notification of all artifact and relation modifications collected as part of a single skynet transaction.

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IRelationModifiedEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IRelationModifiedEventListener.java
index 98454125be4..2f726e70415 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IRelationModifiedEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IRelationModifiedEventListener.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.skynet.core.artifact.Branch;

 import org.eclipse.osee.framework.skynet.core.relation.RelationLink;

@@ -13,7 +13,7 @@ import org.eclipse.osee.framework.ui.plugin.event.Sender;
 /**

  * @author Donald G. Dunne

  */

-public interface IRelationModifiedEventListener extends IXEventListener {

+public interface IRelationModifiedEventListener extends IEventListner {

    public void handleRelationModifiedEvent(Sender sender, RelationModType relationModType, RelationLink link, Branch branch, String relationType, String relationSide);

 

 }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IRemoteEventManagerEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IRemoteEventManagerEventListener.java
index dee2ca19940..c39e6f67d9f 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/IRemoteEventManagerEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/IRemoteEventManagerEventListener.java
@@ -3,14 +3,14 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.ui.plugin.event.Sender;

 

 /**

  * @author Donald G. Dunne

  */

-public interface IRemoteEventManagerEventListener extends IXEventListener {

+public interface IRemoteEventManagerEventListener extends IEventListner {

    public void handleRemoteEventManagerEvent(Sender sender, RemoteEventModType remoteEventModType);

 

 }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/ITransactionsDeletedEventListener.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/ITransactionsDeletedEventListener.java
index 9cde97f8b89..e4b8208a436 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/ITransactionsDeletedEventListener.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/ITransactionsDeletedEventListener.java
@@ -3,14 +3,14 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.ui.plugin.event.Sender;

 

 /**

  * @author Donald G. Dunne

  */

-public interface ITransactionsDeletedEventListener extends IXEventListener {

+public interface ITransactionsDeletedEventListener extends IEventListner {

    public void handleTransactionsDeletedEvent(Sender sender, int[] transactionIds);

 

 }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/LoadedRelation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/LoadedRelation.java
index e684becfb70..fe6203ade4d 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/LoadedRelation.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/LoadedRelation.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.artifact.Branch;

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/XEventManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
index 130b55690c5..9606c86d75e 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/XEventManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/OseeEventManager.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.framework.skynet.core.eventx;
+package org.eclipse.osee.framework.skynet.core.event;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -61,10 +61,10 @@ import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
 /**
  * @author Donald G. Dunne
  */
-public class XEventManager {
+public class OseeEventManager {
 
-   private static final HashCollection<Object, IXEventListener> listenerMap =
-         new HashCollection<Object, IXEventListener>(false, HashSet.class, 100);
+   private static final HashCollection<Object, IEventListner> listenerMap =
+         new HashCollection<Object, IEventListner>(false, HashSet.class, 100);
    public static final Collection<UnloadedArtifact> EMPTY_UNLOADED_ARTIFACTS = Collections.emptyList();
    private static final boolean debug = false;
    private static boolean disableEvents = false;
@@ -85,7 +85,7 @@ public class XEventManager {
       if (isDisableEvents()) return;
       if (debug) System.out.println("kickRemoteEventManagerEvent " + sender.getAuthor() + " remoteEventModType: " + remoteEventModType);
       // Kick Local
-      for (IXEventListener listener : listenerMap.getValues()) {
+      for (IEventListner listener : listenerMap.getValues()) {
          if (listener instanceof IRemoteEventManagerEventListener) {
             // Don't fail on any one listener's exception
             try {
@@ -111,7 +111,7 @@ public class XEventManager {
       if (debug) System.out.println("kickBroadcastEvent " + sender.getAuthor() + " message: " + message);
       // Kick Local
       if (broadcastEventType == BroadcastEventType.Message) {
-         for (IXEventListener listener : listenerMap.getValues()) {
+         for (IEventListner listener : listenerMap.getValues()) {
             if (listener instanceof IBroadcastEventListneer) {
                // Don't fail on any one listener's exception
                try {
@@ -149,7 +149,7 @@ public class XEventManager {
          // do nothing
       }
       // Kick Local
-      for (IXEventListener listener : listenerMap.getValues()) {
+      for (IEventListner listener : listenerMap.getValues()) {
          if (listener instanceof IBranchEventListener) {
             // Don't fail on any one listener's exception
             try {
@@ -196,7 +196,7 @@ public class XEventManager {
          public void run() {
             if (debug) System.out.println("kickAccessControlEvent " + sender.getAuthor() + " accessControlEventType: " + accessControlModType + " loadedArtifacts: " + loadedArtifacts);
             // Kick Local
-            for (IXEventListener listener : listenerMap.getValues()) {
+            for (IEventListner listener : listenerMap.getValues()) {
                if (listener instanceof IAccessControlEventListener) {
                   // Don't fail on any one listener's exception
                   try {
@@ -235,7 +235,7 @@ public class XEventManager {
       if (isDisableEvents()) return;
       if (debug) System.out.println("kickLocalBranchToArtifactCacheUpdateEvent " + sender.getAuthor());
       // Kick Local
-      for (IXEventListener listener : listenerMap.getValues()) {
+      for (IEventListner listener : listenerMap.getValues()) {
          if (listener instanceof IBranchEventListener) {
             // Don't fail on any one listener's exception
             try {
@@ -258,7 +258,7 @@ public class XEventManager {
       if (isDisableEvents()) return;
       if (debug) System.out.println("kickArtifactModifiedEvent " + sender.getSource() + " - " + artifactModType + " - " + artifact.getHumanReadableId() + " - " + artifact.getDirtySkynetAttributeChanges());
       // Kick Local
-      for (IXEventListener listener : listenerMap.getValues()) {
+      for (IEventListner listener : listenerMap.getValues()) {
          if (listener instanceof IArtifactModifiedEventListener) {
             // Don't fail on any one listener's exception
             try {
@@ -282,7 +282,7 @@ public class XEventManager {
       if (isDisableEvents()) return;
       if (debug) System.out.println("kickRelationModifiedEvent " + sender.getSource() + " - " + relationType + " - " + link.getRelationType());
       // Kick Local
-      for (IXEventListener listener : listenerMap.getValues()) {
+      for (IEventListner listener : listenerMap.getValues()) {
          if (listener instanceof IRelationModifiedEventListener) {
             // Don't fail on any one listener's exception
             try {
@@ -306,7 +306,7 @@ public class XEventManager {
       if (isDisableEvents()) return;
       if (debug) System.out.println("kickArtifactsPurgedEvent " + sender.getSource() + " - " + loadedArtifacts);
       // Kick Local
-      for (IXEventListener listener : listenerMap.getValues()) {
+      for (IEventListner listener : listenerMap.getValues()) {
          if (listener instanceof IArtifactsPurgedEventListener) {
             // Don't fail on any one listener's exception
             try {
@@ -342,7 +342,7 @@ public class XEventManager {
       if (isDisableEvents()) return;
       if (debug) System.out.println("kickArtifactsChangeTypeEvent " + sender.getSource() + " - " + loadedArtifacts);
       // Kick Local
-      for (IXEventListener listener : listenerMap.getValues()) {
+      for (IEventListner listener : listenerMap.getValues()) {
          if (listener instanceof IArtifactsChangeTypeEventListener) {
             // Don't fail on any one listener's exception
             try {
@@ -376,7 +376,7 @@ public class XEventManager {
       if (isDisableEvents()) return;
       if (debug) System.out.println("kickTransactionsDeletedEvent " + sender.getSource() + " - " + transactionIds.length);
       // Kick Local
-      for (IXEventListener listener : listenerMap.getValues()) {
+      for (IEventListner listener : listenerMap.getValues()) {
          if (listener instanceof IArtifactsChangeTypeEventListener) {
             // Don't fail on any one listener's exception
             try {
@@ -396,15 +396,15 @@ public class XEventManager {
       }
    }
 
-   public static void kickTransactionEvent(Source source, Collection<XModifiedEvent> xModifiedEvents) {
+   public static void kickTransactionEvent(Source source, Collection<ArtifactTransactionModifiedEvent> xModifiedEvents) {
       if (isDisableEvents()) return;
       if (debug) System.out.println("kickTransactionEvent " + source + " #ModEvents: " + xModifiedEvents.size());
       // Roll-up change information
       FrameworkTransactionData transData = new FrameworkTransactionData();
 
-      for (XModifiedEvent xModifiedEvent : xModifiedEvents) {
-         if (xModifiedEvent instanceof XArtifactModifiedEvent) {
-            XArtifactModifiedEvent xArtifactModifiedEvent = (XArtifactModifiedEvent) xModifiedEvent;
+      for (ArtifactTransactionModifiedEvent xModifiedEvent : xModifiedEvents) {
+         if (xModifiedEvent instanceof ArtifactModifiedEvent) {
+            ArtifactModifiedEvent xArtifactModifiedEvent = (ArtifactModifiedEvent) xModifiedEvent;
             if (xArtifactModifiedEvent.artifactModType == ArtifactModType.Added) {
                if (xArtifactModifiedEvent.artifact != null) {
                   transData.cacheAddedArtifacts.add(xArtifactModifiedEvent.artifact);
@@ -439,8 +439,8 @@ public class XEventManager {
                }
             }
          }
-         if (xModifiedEvent instanceof XRelationModifiedEvent) {
-            XRelationModifiedEvent xRelationModifiedEvent = (XRelationModifiedEvent) xModifiedEvent;
+         if (xModifiedEvent instanceof RelationModifiedEvent) {
+            RelationModifiedEvent xRelationModifiedEvent = (RelationModifiedEvent) xModifiedEvent;
             UnloadedRelation unloadedRelation = xRelationModifiedEvent.unloadedRelation;
             LoadedRelation loadedRelation = null;
             if (xRelationModifiedEvent.link != null) {
@@ -534,7 +534,7 @@ public class XEventManager {
       transData.cacheAddedArtifacts.removeAll(transData.cacheDeletedArtifacts);
 
       // Kick Local
-      for (IXEventListener listener : listenerMap.getValues()) {
+      for (IEventListner listener : listenerMap.getValues()) {
          if (listener instanceof IFrameworkTransactionEventListener) {
             // Don't fail on any one listener's exception
             try {
@@ -548,9 +548,9 @@ public class XEventManager {
       try {
          if (source == Source.Local) {
             List<ISkynetEvent> events = new ArrayList<ISkynetEvent>();
-            for (XModifiedEvent xModifiedEvent : xModifiedEvents) {
-               if (xModifiedEvent instanceof XArtifactModifiedEvent) {
-                  XArtifactModifiedEvent xArtifactModifiedEvent = (XArtifactModifiedEvent) xModifiedEvent;
+            for (ArtifactTransactionModifiedEvent xModifiedEvent : xModifiedEvents) {
+               if (xModifiedEvent instanceof ArtifactModifiedEvent) {
+                  ArtifactModifiedEvent xArtifactModifiedEvent = (ArtifactModifiedEvent) xModifiedEvent;
                   if (xArtifactModifiedEvent.artifactModType == ArtifactModType.Changed) {
                      Artifact artifact = xArtifactModifiedEvent.artifact;
                      events.add(new NetworkArtifactModifiedEvent(artifact.getBranch().getBranchId(),
@@ -574,8 +574,8 @@ public class XEventManager {
                      SkynetActivator.getLogger().log(Level.SEVERE,
                            "Unhandled xArtifactModifiedEvent event: " + xArtifactModifiedEvent);
                   }
-               } else if (xModifiedEvent instanceof XRelationModifiedEvent) {
-                  XRelationModifiedEvent xRelationModifiedEvent = (XRelationModifiedEvent) xModifiedEvent;
+               } else if (xModifiedEvent instanceof RelationModifiedEvent) {
+                  RelationModifiedEvent xRelationModifiedEvent = (RelationModifiedEvent) xModifiedEvent;
                   if (xRelationModifiedEvent.relationModType == RelationModType.Changed) {
                      RelationLink link = xRelationModifiedEvent.link;
                      Artifact aArtifact = link.getArtifactIfLoaded(RelationSide.SIDE_A);
@@ -631,24 +631,24 @@ public class XEventManager {
     * @param key unique object that will allow for removing all or specific listeners in removeListners
     * @param listener
     */
-   public static void addListener(Object key, IXEventListener listener) {
+   public static void addListener(Object key, IEventListner listener) {
       if (debug) System.out.println("addListener " + key + " - " + listener);
       listenerMap.put(key, listener);
    }
 
-   public static void removeListener(Object key, IXEventListener listener) {
+   public static void removeListener(Object key, IEventListner listener) {
       if (debug) System.out.println("removeListener " + key + " - " + listener);
       listenerMap.removeValue(key, listener);
    }
 
    public static void removeListeners(Object key) {
       if (debug) System.out.println("removeListeners ALL " + key);
-      Set<IXEventListener> listenersToRemove = new HashSet<IXEventListener>();
-      for (IXEventListener listener : listenerMap.getValues(key)) {
+      Set<IEventListner> listenersToRemove = new HashSet<IEventListner>();
+      for (IEventListner listener : listenerMap.getValues(key)) {
          listenersToRemove.add(listener);
       }
       // Done to avoid concurrent modification
-      for (IXEventListener listener : listenersToRemove) {
+      for (IEventListner listener : listenersToRemove) {
          listenerMap.removeValue(key, listener);
       }
    }
@@ -664,7 +664,7 @@ public class XEventManager {
     * @param disableEvents the disableEvents to set
     */
    public static void setDisableEvents(boolean disableEvents) {
-      XEventManager.disableEvents = disableEvents;
+      OseeEventManager.disableEvents = disableEvents;
    }
 
 }
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/XRelationModifiedEvent.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RelationModifiedEvent.java
index a965890926f..0337d9f73a2 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/XRelationModifiedEvent.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RelationModifiedEvent.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 import org.eclipse.osee.framework.skynet.core.artifact.Branch;

 import org.eclipse.osee.framework.skynet.core.relation.RelationLink;

@@ -14,7 +14,7 @@ import org.eclipse.osee.framework.ui.plugin.event.UnloadedRelation;
 /**

  * @author Donald G. Dunne

  */

-public class XRelationModifiedEvent extends XModifiedEvent {

+public class RelationModifiedEvent extends ArtifactTransactionModifiedEvent {

 

    protected final Sender sender;

    protected final RelationModType relationModType;

@@ -24,7 +24,7 @@ public class XRelationModifiedEvent extends XModifiedEvent {
    protected final String relationSide;

    protected final UnloadedRelation unloadedRelation;

 

-   public XRelationModifiedEvent(Sender sender, RelationModType relationModType, RelationLink link, Branch branch, String relationType, String relationSide) {

+   public RelationModifiedEvent(Sender sender, RelationModType relationModType, RelationLink link, Branch branch, String relationType, String relationSide) {

       this.sender = sender;

       this.relationModType = relationModType;

       this.link = link;

@@ -34,7 +34,7 @@ public class XRelationModifiedEvent extends XModifiedEvent {
       this.unloadedRelation = null;

    }

 

-   public XRelationModifiedEvent(Sender sender, RelationModType relationModType, UnloadedRelation unloadedRelation) {

+   public RelationModifiedEvent(Sender sender, RelationModType relationModType, UnloadedRelation unloadedRelation) {

       this.sender = sender;

       this.relationModType = relationModType;

       this.unloadedRelation = unloadedRelation;

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/RemoteEventModType.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventModType.java
index 9bb86da526c..67e6eb5ae09 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/eventx/RemoteEventModType.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/event/RemoteEventModType.java
@@ -3,7 +3,7 @@
  *

  * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE

  */

-package org.eclipse.osee.framework.skynet.core.eventx;

+package org.eclipse.osee.framework.skynet.core.event;

 

 /**

  * @author Donald G. Dunne

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
index 2e98d38a578..535c34fba39 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationLink.java
@@ -17,7 +17,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;

 import org.eclipse.osee.framework.skynet.core.artifact.Branch;

 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;

 

@@ -135,7 +135,7 @@ public class RelationLink {
          }

 

          try {

-            XEventManager.kickRelationModifiedEvent(XEventManager.getSender(Source.Local, RelationManager.class),

+            OseeEventManager.kickRelationModifiedEvent(OseeEventManager.getSender(Source.Local, RelationManager.class),

                   RelationModType.Deleted, this, getABranch(), relationType.getTypeName(), getASideName());

          } catch (Exception ex) {

             SkynetActivator.getLogger().log(Level.SEVERE, ex.getLocalizedMessage(), ex);

@@ -275,7 +275,7 @@ public class RelationLink {
 

       if (notify) {

          try {

-            XEventManager.kickRelationModifiedEvent(XEventManager.getSender(Source.Local, RelationManager.class),

+            OseeEventManager.kickRelationModifiedEvent(OseeEventManager.getSender(Source.Local, RelationManager.class),

                   RelationModType.RationaleMod, this, getABranch(), relationType.getTypeName(), getASideName());

          } catch (Exception ex) {

             SkynetActivator.getLogger().log(Level.SEVERE, ex.getLocalizedMessage(), ex);

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
index 764afde78b3..f09f1ebf22d 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationManager.java
@@ -35,7 +35,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoad;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactLoader;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactType;

 import org.eclipse.osee.framework.skynet.core.artifact.Branch;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.exception.MultipleArtifactsExist;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

@@ -438,7 +438,7 @@ public class RelationManager {
          RelationManager.manageRelation(relation, RelationSide.SIDE_B);

 

          try {

-            XEventManager.kickRelationModifiedEvent(XEventManager.getSender(Source.Local, RelationManager.class),

+            OseeEventManager.kickRelationModifiedEvent(OseeEventManager.getSender(Source.Local, RelationManager.class),

                   RelationModType.Added, relation, relation.getABranch(), relationType.getTypeName(),

                   relation.getASideName());

          } catch (Exception ex) {

@@ -560,7 +560,7 @@ public class RelationManager {
       }

 

       Sender sender = new Sender(Source.Local, RelationManager.class, SkynetAuthentication.getAuthor());

-      XEventManager.kickRelationModifiedEvent(sender, RelationModType.Added, relation, relation.getBranch(),

+      OseeEventManager.kickRelationModifiedEvent(sender, RelationModType.Added, relation, relation.getBranch(),

             relation.getRelationType().getTypeName(), "");

 

    }

@@ -633,7 +633,7 @@ public class RelationManager {
             artifactATarget, artifactB);

 

       try {

-         XEventManager.kickRelationModifiedEvent(XEventManager.getSender(Source.Local, RelationManager.class),

+         OseeEventManager.kickRelationModifiedEvent(OseeEventManager.getSender(Source.Local, RelationManager.class),

                RelationModType.ReOrdered, relation, relation.getABranch(), relationType.getTypeName(),

                relation.getASideName());

       } catch (Exception ex) {

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationPersistenceManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationPersistenceManager.java
index b01a488831f..9f0702fc7a5 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationPersistenceManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/relation/RelationPersistenceManager.java
@@ -21,7 +21,7 @@ import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache;
 import org.eclipse.osee.framework.skynet.core.change.ModificationType;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.transaction.AbstractSkynetTxTemplate;
@@ -105,7 +105,7 @@ public class RelationPersistenceManager {
             transaction.addRelationModifiedEvent(sender, RelationModType.Deleted, link, link.getBranch(),
                   link.getRelationType().getTypeName(), link.getASideName());
 
-            XEventManager.kickRelationModifiedEvent(sender, RelationModType.Deleted, link, link.getBranch(),
+            OseeEventManager.kickRelationModifiedEvent(sender, RelationModType.Deleted, link, link.getBranch(),
                   link.getRelationType().getTypeName(), link.getASideName());
 
          } else {
@@ -121,7 +121,7 @@ public class RelationPersistenceManager {
             transaction.addRelationModifiedEvent(sender, RelationModType.Changed, link, link.getBranch(),
                   link.getRelationType().getTypeName(), link.getASideName());
 
-            XEventManager.kickRelationModifiedEvent(sender, RelationModType.Changed, link, link.getBranch(),
+            OseeEventManager.kickRelationModifiedEvent(sender, RelationModType.Changed, link, link.getBranch(),
                   link.getRelationType().getTypeName(), link.getASideName());
          }
       } else {
@@ -146,7 +146,7 @@ public class RelationPersistenceManager {
          transaction.addRelationModifiedEvent(sender, RelationModType.Added, link, link.getBranch(),
                link.getRelationType().getTypeName(), link.getASideName());
 
-         XEventManager.kickRelationModifiedEvent(sender, RelationModType.Added, link, link.getBranch(),
+         OseeEventManager.kickRelationModifiedEvent(sender, RelationModType.Added, link, link.getBranch(),
                link.getRelationType().getTypeName(), link.getASideName());
       }
 
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionManager.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionManager.java
index 7e9fb3b4f07..ace35b4ec72 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionManager.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/revision/RevisionManager.java
@@ -58,8 +58,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ISearchPrimitive;
 import org.eclipse.osee.framework.skynet.core.artifact.search.RelationInTransactionSearch;

 import org.eclipse.osee.framework.skynet.core.change.ChangeType;

 import org.eclipse.osee.framework.skynet.core.change.ModificationType;

-import org.eclipse.osee.framework.skynet.core.eventx.BranchEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.BranchEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.exception.BranchDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

@@ -171,7 +171,7 @@ public class RevisionManager {
          } finally {

             DbUtil.close(chStmt);

          }

-         XEventManager.addListener(this, new BranchEventListener() {

+         OseeEventManager.addListener(this, new BranchEventListener() {

             /* (non-Javadoc)

              * @see org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener#handleBranchEvent(org.eclipse.osee.framework.ui.plugin.event.Sender, org.eclipse.osee.framework.skynet.core.artifact.BranchModType, org.eclipse.osee.framework.skynet.core.artifact.Branch, int)

              */

@@ -185,7 +185,7 @@ public class RevisionManager {
                    * though cache has bee set to null, it will be re-created upon next call to get cached information

                    */

                   try {

-                     XEventManager.kickLocalBranchToArtifactCacheUpdateEvent(XEventManager.getSender(Source.Local, this));

+                     OseeEventManager.kickLocalBranchToArtifactCacheUpdateEvent(OseeEventManager.getSender(Source.Local, this));

                   } catch (Exception ex) {

                      SkynetActivator.getLogger().log(Level.SEVERE, ex.getLocalizedMessage(), ex);

                   }

diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
index 6b180e9436e..01db6d6b196 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/transaction/SkynetTransaction.java
@@ -40,10 +40,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.skynet.core.attribute.utils.AttributeURL;

 import org.eclipse.osee.framework.skynet.core.change.ModificationType;

 import org.eclipse.osee.framework.skynet.core.change.TxChange;

-import org.eclipse.osee.framework.skynet.core.eventx.XArtifactModifiedEvent;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

-import org.eclipse.osee.framework.skynet.core.eventx.XModifiedEvent;

-import org.eclipse.osee.framework.skynet.core.eventx.XRelationModifiedEvent;

+import org.eclipse.osee.framework.skynet.core.event.ArtifactModifiedEvent;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

+import org.eclipse.osee.framework.skynet.core.event.ArtifactTransactionModifiedEvent;

+import org.eclipse.osee.framework.skynet.core.event.RelationModifiedEvent;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.skynet.core.relation.RelationLink;

 import org.eclipse.osee.framework.skynet.core.relation.RelationModType;

@@ -64,7 +64,7 @@ public class SkynetTransaction {
    private String comment;

    private final TransactionId transactionId;

    private final Branch branch;

-   private final List<XModifiedEvent> xModifiedEvents = new ArrayList<XModifiedEvent>();

+   private final List<ArtifactTransactionModifiedEvent> xModifiedEvents = new ArrayList<ArtifactTransactionModifiedEvent>();

    private final Map<ITransactionData, ITransactionData> transactionItems =

          new HashMap<ITransactionData, ITransactionData>();

 

@@ -212,12 +212,12 @@ public class SkynetTransaction {
    }

 

    public void addArtifactModifiedEvent(Sender sender, ArtifactModType artifactModType, Artifact artifact) throws OseeCoreException {

-      xModifiedEvents.add(new XArtifactModifiedEvent(sender, artifactModType, artifact, getTransactionNumber(),

+      xModifiedEvents.add(new ArtifactModifiedEvent(sender, artifactModType, artifact, getTransactionNumber(),

             artifact.getDirtySkynetAttributeChanges()));

    }

 

    public void addRelationModifiedEvent(Sender sender, RelationModType relationModType, RelationLink link, Branch branch, String relationType, String relationSide) {

-      xModifiedEvents.add(new XRelationModifiedEvent(sender, relationModType, link, branch, relationType, relationSide));

+      xModifiedEvents.add(new RelationModifiedEvent(sender, relationModType, link, branch, relationType, relationSide));

    }

 

    /**

@@ -225,7 +225,7 @@ public class SkynetTransaction {
     */

    public void kickEvents() {

       if (xModifiedEvents.size() > 0) {

-         XEventManager.kickTransactionEvent(Source.Local, xModifiedEvents);

+         OseeEventManager.kickTransactionEvent(Source.Local, xModifiedEvents);

          xModifiedEvents.clear();

       }

    }

diff --git a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
index b09179d8c0b..2340c8520cf 100644
--- a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
+++ b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/AdminView.java
@@ -17,8 +17,8 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;
 import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.eventx.BroadcastEventType;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.BroadcastEventType;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.admin.autoRun.AutoRunTab;
 import org.eclipse.osee.framework.ui.admin.dbtabletab.DbItem;
 import org.eclipse.osee.framework.ui.admin.dbtabletab.DbTableTab;
@@ -133,7 +133,7 @@ public class AdminView extends ViewPart implements IActionable {
             if (MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), "Broadcast Message",
                   "Broadcast message\n\n\"" + message + "\"\n\nAre you sure?")) {
                try {
-                  XEventManager.kickBroadcastEvent(XEventManager.getSender(Source.Local, this),
+                  OseeEventManager.kickBroadcastEvent(OseeEventManager.getSender(Source.Local, this),
                         BroadcastEventType.Message, new String[] {}, message);
                   AWorkbench.popup("Success", "Message sent.");
                } catch (Exception ex) {
diff --git a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java
index fb411bbd0d5..5722827502c 100644
--- a/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java
+++ b/org.eclipse.osee.framework.ui.admin/src/org/eclipse/osee/framework/ui/admin/OseeClientsTab.java
@@ -21,8 +21,8 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;
 import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.eventx.BroadcastEventType;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.BroadcastEventType;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -152,7 +152,7 @@ public class OseeClientsTab {
                      "Are you sure you want to shutdown the selected OSEE clients?");
          if (false != result) {
             try {
-               XEventManager.kickBroadcastEvent(XEventManager.getSender(Source.Local, this),
+               OseeEventManager.kickBroadcastEvent(OseeEventManager.getSender(Source.Local, this),
                      BroadcastEventType.Force_Shutdown, selectedUsers, reason);
                AWorkbench.popup("Success", "Shutdown request sent.");
             } catch (Exception ex) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
index 36930420c87..590a0ea1739 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactExplorer.java
@@ -54,17 +54,17 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;

 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;

 import org.eclipse.osee.framework.skynet.core.attribute.ConfigurationPersistenceManager;

-import org.eclipse.osee.framework.skynet.core.eventx.AccessControlModType;

-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;

-import org.eclipse.osee.framework.skynet.core.eventx.IAccessControlEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactModifiedEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactsChangeTypeEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactsPurgedEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IRelationModifiedEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData.ChangeType;

+import org.eclipse.osee.framework.skynet.core.event.AccessControlModType;

+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;

+import org.eclipse.osee.framework.skynet.core.event.IAccessControlEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IArtifactModifiedEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IArtifactsChangeTypeEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IArtifactsPurgedEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IRelationModifiedEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData.ChangeType;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;

@@ -315,7 +315,7 @@ public class ArtifactExplorer extends ViewPart implements IAccessControlEventLis
          OSEELog.logException(SkynetGuiPlugin.class, ex, true);

       }

 

-      XEventManager.addListener(this, this);

+      OseeEventManager.addListener(this, this);

    }

 

    /**

@@ -1246,7 +1246,7 @@ public class ArtifactExplorer extends ViewPart implements IAccessControlEventLis
    @Override

    public void dispose() {

       super.dispose();

-      XEventManager.removeListeners(this);

+      OseeEventManager.removeListeners(this);

       if (treeViewer != null) {

          trees.remove(treeViewer.getTree());

       }

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactSearchViewPage.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactSearchViewPage.java
index cff2fa8f48b..f3dd110c6da 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactSearchViewPage.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/ArtifactSearchViewPage.java
@@ -46,9 +46,9 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;

 import org.eclipse.osee.framework.skynet.core.artifact.WordArtifact;

 import org.eclipse.osee.framework.skynet.core.attribute.Attribute;

-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;

-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;

+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.skynet.core.relation.RelationType;

 import org.eclipse.osee.framework.skynet.core.relation.RelationTypeManager;

@@ -141,7 +141,7 @@ public class ArtifactSearchViewPage extends AbstractArtifactSearchViewPage imple
 

       SkynetContributionItem.addTo(this, false);

       getSite().getActionBars().updateActionBars();

-      XEventManager.addListener(this, this);

+      OseeEventManager.addListener(this, this);

    }

 

    private void createContextMenu(Control menuOnwer) {

@@ -805,7 +805,7 @@ public class ArtifactSearchViewPage extends AbstractArtifactSearchViewPage imple
 

    @Override

    public void dispose() {

-      XEventManager.removeListeners(this);

+      OseeEventManager.removeListeners(this);

       super.dispose();

    }

 

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
index d67aca3e39d..9b4bc7fe571 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/RelationsComposite.java
@@ -36,10 +36,10 @@ import org.eclipse.osee.framework.logging.OseeLog;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData;
 import org.eclipse.osee.framework.skynet.core.artifact.Branch;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.IRelationModifiedEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IRelationModifiedEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.relation.RelationLink;
@@ -130,7 +130,7 @@ public class RelationsComposite extends Composite implements IRelationModifiedEv
       this.artifactToLinkMap = new HashMap<Integer, RelationLink>();
 
       createPartControl();
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
       this.toolBar = toolBar;
    }
 
@@ -505,7 +505,7 @@ public class RelationsComposite extends Composite implements IRelationModifiedEv
    @Override
    public void dispose() {
       super.dispose();
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    private void expandAll(IStructuredSelection selection) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetAuthenticationContributionItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetAuthenticationContributionItem.java
index 0f7a816c60a..f4bad598725 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetAuthenticationContributionItem.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetAuthenticationContributionItem.java
@@ -16,9 +16,9 @@ import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;
 import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.eventx.AccessControlModType;
-import org.eclipse.osee.framework.skynet.core.eventx.IAccessControlEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.AccessControlModType;
+import org.eclipse.osee.framework.skynet.core.event.IAccessControlEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.utility.LoadedArtifacts;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.security.AuthenticationDialog;
@@ -75,7 +75,7 @@ public class SkynetAuthenticationContributionItem extends SkynetContributionItem
             SkynetAuthentication.notifyListeners();
          }
       });
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    public static void addTo(IStatusLineManager manager) {
@@ -86,7 +86,7 @@ public class SkynetAuthenticationContributionItem extends SkynetContributionItem
 
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetDefaultBranchContributionItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetDefaultBranchContributionItem.java
index 416b3769a52..d59b0b20df8 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetDefaultBranchContributionItem.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetDefaultBranchContributionItem.java
@@ -16,8 +16,8 @@ import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.jface.window.Window;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.skynet.branch.BranchLabelProvider;
@@ -59,7 +59,7 @@ public class SkynetDefaultBranchContributionItem extends SkynetContributionItem
    private void init() {
       updateStatus(true);
       updateInfo();
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    private void updateInfo() {
@@ -112,7 +112,7 @@ public class SkynetDefaultBranchContributionItem extends SkynetContributionItem
 
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
 }
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java
index a6661f25662..5651cdd494e 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetGuiPlugin.java
@@ -17,9 +17,9 @@ import org.eclipse.osee.framework.plugin.core.config.ConfigUtil;
 import org.eclipse.osee.framework.skynet.core.SkynetActivator;
 import org.eclipse.osee.framework.skynet.core.SkynetAuthentication;
 import org.eclipse.osee.framework.skynet.core.User;
-import org.eclipse.osee.framework.skynet.core.eventx.BroadcastEventType;
-import org.eclipse.osee.framework.skynet.core.eventx.IBroadcastEventListneer;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.BroadcastEventType;
+import org.eclipse.osee.framework.skynet.core.event.IBroadcastEventListneer;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.OseeFormActivator;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.skynet.access.OseeSecurityManager;
@@ -47,7 +47,7 @@ public class SkynetGuiPlugin extends OseeFormActivator implements IBroadcastEven
       super();
       pluginInstance = this;
       securityManager = OseeSecurityManager.getInstance();
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetServiceContributionItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetServiceContributionItem.java
index 10d2a3b021c..4c5c6d0850f 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetServiceContributionItem.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/SkynetServiceContributionItem.java
@@ -13,9 +13,9 @@ package org.eclipse.osee.framework.ui.skynet;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.IStatusLineManager;
 import org.eclipse.osee.framework.skynet.core.artifact.RemoteEventManager;
-import org.eclipse.osee.framework.skynet.core.eventx.IRemoteEventManagerEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.RemoteEventModType;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IRemoteEventManagerEventListener;
+import org.eclipse.osee.framework.skynet.core.event.RemoteEventModType;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.plugin.util.OverlayImage;
@@ -39,7 +39,7 @@ public class SkynetServiceContributionItem extends SkynetContributionItem implem
    public SkynetServiceContributionItem() {
       super(ID, ENABLED, DISABLED, ENABLED_TOOLTIP, DISABLED_TOOLTIP);
       updateStatus(RemoteEventManager.isConnected());
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    public static void addTo(IStatusLineManager manager) {
@@ -56,7 +56,7 @@ public class SkynetServiceContributionItem extends SkynetContributionItem implem
 
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    /* (non-Javadoc)
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java
index 947b3a4f535..162a5e4e182 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/editor/ArtifactEditor.java
@@ -35,16 +35,16 @@ import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;

 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;

 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;

-import org.eclipse.osee.framework.skynet.core.eventx.AccessControlModType;

-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;

-import org.eclipse.osee.framework.skynet.core.eventx.IAccessControlEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactModifiedEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactsChangeTypeEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactsPurgedEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IRelationModifiedEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.AccessControlModType;

+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;

+import org.eclipse.osee.framework.skynet.core.event.IAccessControlEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IArtifactModifiedEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IArtifactsChangeTypeEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IArtifactsPurgedEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IRelationModifiedEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.skynet.core.relation.RelationLink;

 import org.eclipse.osee.framework.skynet.core.relation.RelationModType;

@@ -213,7 +213,7 @@ public class ArtifactEditor extends MultiPageEditorPart implements IDirtiableEdi
       setPartName(getEditorInput().getName());

       setTitleImage(artifact.getImage());

 

-      XEventManager.addListener(this, this);

+      OseeEventManager.addListener(this, this);

 

    }

 

@@ -530,7 +530,7 @@ public class ArtifactEditor extends MultiPageEditorPart implements IDirtiableEdi
             }

          }

 

-         XEventManager.removeListeners(this);

+         OseeEventManager.removeListeners(this);

          super.dispose();

       } catch (SQLException ex) {

          SkynetGuiPlugin.getLogger().log(Level.SEVERE, ex.getLocalizedMessage(), ex);

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java
index 8f9337d9234..077bd9218b6 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassArtifactEditor.java
@@ -24,8 +24,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
@@ -196,7 +196,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IDirti
    @Override
    public void dispose() {
       super.dispose();
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
 
       for (Artifact taskArt : artifacts)
          try {
@@ -276,7 +276,7 @@ public class MassArtifactEditor extends AbstractArtifactEditor implements IDirti
       tree.setLayoutData(gridData);
       tree.setHeaderVisible(true);
       tree.setLinesVisible(true);
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
 
       setActivePage(artifactsPageIndex);
       try {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java
index a78e4b84673..72424b049d8 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/artifact/massEditor/MassXViewer.java
@@ -22,11 +22,11 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData;
 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTransfer;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactsChangeTypeEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.IArtifactsPurgedEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IArtifactsChangeTypeEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IArtifactsPurgedEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.event.UnloadedArtifact;
 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
@@ -74,7 +74,7 @@ public class MassXViewer extends XViewer implements IFrameworkTransactionEventLi
             handleDoubleClick();
          };
       });
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    @Override
@@ -231,7 +231,7 @@ public class MassXViewer extends XViewer implements IFrameworkTransactionEventLi
     */
    @Override
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
       // Tell the label provider to release its resources
       getLabelProvider().dispose();
    }
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchView.java
index f0dbf12cac2..fe7d3efc14d 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchView.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/branch/BranchView.java
@@ -67,8 +67,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;

 import org.eclipse.osee.framework.skynet.core.artifact.IATSArtifact;

 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;

-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ConflictDetectionException;

 import org.eclipse.osee.framework.skynet.core.exception.MultipleBranchesExist;

 import org.eclipse.osee.framework.skynet.core.revision.ArtifactChange;

@@ -271,7 +271,7 @@ public class BranchView extends ViewPart implements IActionable, IBranchEventLis
          myTreeEditor.minimumWidth = 50;

 

          forcePopulateView();

-         XEventManager.addListener(this, this);

+         OseeEventManager.addListener(this, this);

       } catch (SQLException ex) {

          OSEELog.logException(SkynetGuiPlugin.class, ex, true);

       }

@@ -1740,7 +1740,7 @@ public class BranchView extends ViewPart implements IActionable, IBranchEventLis
          OSEELog.logException(BranchView.class, ex, true);

       }

 

-      XEventManager.removeListeners(this);

+      OseeEventManager.removeListeners(this);

       super.dispose();

    }

 

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/changeReport/ChangeReportView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/changeReport/ChangeReportView.java
index ed18d6349ba..ab8d7b5c308 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/changeReport/ChangeReportView.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/changeReport/ChangeReportView.java
@@ -59,8 +59,8 @@ import org.eclipse.osee.framework.skynet.core.artifact.WordArtifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;

 import org.eclipse.osee.framework.skynet.core.change.ChangeType;

 import org.eclipse.osee.framework.skynet.core.change.ModificationType;

-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.skynet.core.revision.ArtifactChange;

 import org.eclipse.osee.framework.skynet.core.revision.AttributeChange;

@@ -174,7 +174,7 @@ public class ChangeReportView extends ViewPart implements IActionable, IBranchEv
       this.toTransactionId = null;

       this.priorInput = null;

 

-      XEventManager.addListener(this, this);

+      OseeEventManager.addListener(this, this);

    }

 

    public TreeViewer getChangeTableTreeViewer() {

@@ -1169,7 +1169,7 @@ public class ChangeReportView extends ViewPart implements IActionable, IBranchEv
     */

    @Override

    public void dispose() {

-      XEventManager.removeListeners(this);

+      OseeEventManager.removeListeners(this);

       super.dispose();

    }

 

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
index c264c9b9b37..a68c775e8dc 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorer.java
@@ -29,10 +29,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.ArtifactData;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
 import org.eclipse.osee.framework.skynet.core.artifact.UniversalGroup;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;
 import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
 import org.eclipse.osee.framework.skynet.core.transaction.AbstractSkynetTxTemplate;
@@ -123,7 +123,7 @@ public class GroupExplorer extends ViewPart implements IBranchEventListener, IFr
 
       SkynetContributionItem.addTo(this, true);
 
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
 
       new GroupExplorerDragAndDrop(treeViewer.getTree(), VIEW_ID);
 
@@ -404,7 +404,7 @@ public class GroupExplorer extends ViewPart implements IBranchEventListener, IFr
    @Override
    public void dispose() {
       super.dispose();
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    public String getActionDescription() {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java
index 8f36c0678f1..2c1f76a8a36 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/group/GroupExplorerItem.java
@@ -16,9 +16,9 @@ import java.util.List;
 import java.util.logging.Level;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.skynet.core.relation.CoreRelationEnumeration;
 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
@@ -40,7 +40,7 @@ public class GroupExplorerItem implements IFrameworkTransactionEventListener {
       this.artifact = artifact;
       this.parentItem = parentItem;
       this.groupExplorer = groupExplorer;
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    public boolean contains(Artifact artifact) {
@@ -64,7 +64,7 @@ public class GroupExplorerItem implements IFrameworkTransactionEventListener {
    }
 
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
       if (groupItems != null) for (GroupExplorerItem item : groupItems)
          item.dispose();
    }
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/RevisionHistoryView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/RevisionHistoryView.java
index 15aa05050d8..2ac5fbc5c38 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/RevisionHistoryView.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/history/RevisionHistoryView.java
@@ -21,10 +21,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;

 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;

 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;

-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;

-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;

+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.ArtifactDoesNotExist;

 import org.eclipse.osee.framework.ui.plugin.event.Sender;

 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;

@@ -69,7 +69,7 @@ public class RevisionHistoryView extends ViewPart implements IActionable, IFrame
    public RevisionHistoryView() {

       super();

 

-      XEventManager.addListener(this, this);

+      OseeEventManager.addListener(this, this);

    }

 

    public static void open(Artifact artifact) {

@@ -261,7 +261,7 @@ public class RevisionHistoryView extends ViewPart implements IActionable, IFrame
     */

    @Override

    public void dispose() {

-      XEventManager.removeListeners(this);

+      OseeEventManager.removeListeners(this);

       super.dispose();

    }

 

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
index 65ca6a04b2b..9e52ade8ba3 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/search/QuickSearchView.java
@@ -19,8 +19,8 @@ import java.util.List;
 import java.util.Map;

 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;

 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;

-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.ui.plugin.event.Sender;

 import org.eclipse.osee.framework.ui.plugin.util.Displays;

 import org.eclipse.osee.framework.ui.skynet.SkynetContributionItem;

@@ -185,7 +185,7 @@ public class QuickSearchView extends ViewPart implements IActionable, Listener,
 

       createActions();

 

-      XEventManager.addListener(this, this);

+      OseeEventManager.addListener(this, this);

       updateWidgetEnablements();

 

       Composite panel = new Composite(parent, SWT.NONE);

@@ -252,7 +252,7 @@ public class QuickSearchView extends ViewPart implements IActionable, Listener,
    @Override

    public void dispose() {

       super.dispose();

-      XEventManager.removeListeners(this);

+      OseeEventManager.removeListeners(this);

    }

 

    /* (non-Javadoc)

diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java
index 4b0822f1234..930c3e7b12c 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/DefaultBranchContentProvider.java
@@ -14,8 +14,8 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 
@@ -42,7 +42,7 @@ public class DefaultBranchContentProvider implements ITreeContentProvider, IBran
    }
 
    public void dispose() {
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    public Object[] getChildren(Object parentElement) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java
index 8a259b63c53..0f53ea56f9a 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xchange/ChangeView.java
@@ -24,7 +24,7 @@ import org.eclipse.jface.action.Separator;
 import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
 import org.eclipse.osee.framework.skynet.core.exception.BranchDoesNotExist;
 import org.eclipse.osee.framework.skynet.core.transaction.TransactionId;
 import org.eclipse.osee.framework.skynet.core.transaction.TransactionIdManager;
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitManagerView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitManagerView.java
index ddc0c76e622..5b082909fe7 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitManagerView.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xcommit/CommitManagerView.java
@@ -22,10 +22,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.Branch;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchModType;
 import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;
-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;
-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;
+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;
+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;
+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;
+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;
 import org.eclipse.osee.framework.ui.plugin.event.Sender;
 import org.eclipse.osee.framework.ui.plugin.event.Sender.Source;
 import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
@@ -94,7 +94,7 @@ public class CommitManagerView extends ViewPart implements IActionable, IBranchE
    @Override
    public void dispose() {
       super.dispose();
-      XEventManager.removeListeners(this);
+      OseeEventManager.removeListeners(this);
    }
 
    @Override
@@ -128,7 +128,7 @@ public class CommitManagerView extends ViewPart implements IActionable, IBranchE
 
       SkynetGuiPlugin.getInstance().setHelp(parent, HELP_CONTEXT_ID);
 
-      XEventManager.addListener(this, this);
+      OseeEventManager.addListener(this, this);
    }
 
    public void explore(IBranchArtifact branchArtifact) {
diff --git a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
index a1676a103bf..091830328a5 100644
--- a/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
+++ b/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/widgets/xmerge/MergeView.java
@@ -37,10 +37,10 @@ import org.eclipse.osee.framework.skynet.core.artifact.BranchPersistenceManager;
 import org.eclipse.osee.framework.skynet.core.conflict.ArtifactConflict;

 import org.eclipse.osee.framework.skynet.core.conflict.AttributeConflict;

 import org.eclipse.osee.framework.skynet.core.conflict.Conflict;

-import org.eclipse.osee.framework.skynet.core.eventx.FrameworkTransactionData;

-import org.eclipse.osee.framework.skynet.core.eventx.IBranchEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.IFrameworkTransactionEventListener;

-import org.eclipse.osee.framework.skynet.core.eventx.XEventManager;

+import org.eclipse.osee.framework.skynet.core.event.FrameworkTransactionData;

+import org.eclipse.osee.framework.skynet.core.event.IBranchEventListener;

+import org.eclipse.osee.framework.skynet.core.event.IFrameworkTransactionEventListener;

+import org.eclipse.osee.framework.skynet.core.event.OseeEventManager;

 import org.eclipse.osee.framework.skynet.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.skynet.core.transaction.TransactionId;

 import org.eclipse.osee.framework.skynet.core.transaction.TransactionIdManager;

@@ -144,7 +144,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList
    @Override

    public void dispose() {

       super.dispose();

-      XEventManager.removeListeners(this);

+      OseeEventManager.removeListeners(this);

    }

 

    @Override

@@ -222,7 +222,7 @@ public class MergeView extends ViewPart implements IActionable, IBranchEventList
       getSite().setSelectionProvider(xMergeViewer.getXViewer());

       SkynetGuiPlugin.getInstance().setHelp(parent, HELP_CONTEXT_ID);

 

-      XEventManager.addListener(this, this);

+      OseeEventManager.addListener(this, this);

    }

 

    /**