diff --git a/src/CounterDrone.Core/Services/IReportService.cs b/src/CounterDrone.Core/Services/IReportService.cs
index b25558d..1d92d9e 100644
--- a/src/CounterDrone.Core/Services/IReportService.cs
+++ b/src/CounterDrone.Core/Services/IReportService.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using CounterDrone.Core.Models;
-using SimEvent = CounterDrone.Core.Simulation.SimEvent;
+using CounterDrone.Core.Simulation;
 
 namespace CounterDrone.Core.Services
 {
diff --git a/src/CounterDrone.Core/Services/ReportGenerator.cs b/src/CounterDrone.Core/Services/ReportGenerator.cs
index bf4cb44..d1cfc36 100644
--- a/src/CounterDrone.Core/Services/ReportGenerator.cs
+++ b/src/CounterDrone.Core/Services/ReportGenerator.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using CounterDrone.Core.Models;
-using SimEvent = CounterDrone.Core.Simulation.SimEvent;
+using CounterDrone.Core.Simulation;
 
 namespace CounterDrone.Core.Services
 {
diff --git a/src/CounterDrone.Core/Services/ReportService.cs b/src/CounterDrone.Core/Services/ReportService.cs
index 1d8d4bc..ecc0400 100644
--- a/src/CounterDrone.Core/Services/ReportService.cs
+++ b/src/CounterDrone.Core/Services/ReportService.cs
@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using CounterDrone.Core.Models;
 using SQLite;
-using SimEvent = CounterDrone.Core.Simulation.SimEvent;
+using CounterDrone.Core.Simulation;
 
 namespace CounterDrone.Core.Services
 {
diff --git a/src/Unity/Assets/Scripts/Managers/ManagerVerification.cs b/src/Unity/Assets/Scripts/Managers/ManagerVerification.cs
index f67f057..09bef2d 100644
--- a/src/Unity/Assets/Scripts/Managers/ManagerVerification.cs
+++ b/src/Unity/Assets/Scripts/Managers/ManagerVerification.cs
@@ -4,7 +4,6 @@ using CounterDrone.Core.Algorithms;
 using CounterDrone.Core.Models;
 using CounterDrone.Core.Simulation;
 using UnityEngine;
-using SimEvent = CounterDrone.Core.Simulation.SimEvent;
 using AVector3 = CounterDrone.Core.Algorithms.Vector3;
 
 namespace CounterDrone.Unity
diff --git a/src/Unity/Assets/Scripts/Managers/ReportManager.cs b/src/Unity/Assets/Scripts/Managers/ReportManager.cs
index ec8fa54..66c5de6 100644
--- a/src/Unity/Assets/Scripts/Managers/ReportManager.cs
+++ b/src/Unity/Assets/Scripts/Managers/ReportManager.cs
@@ -3,7 +3,7 @@ using CounterDrone.Core;
 using CounterDrone.Core.Models;
 using CounterDrone.Core.Services;
 using UnityEngine;
-using SimEvent = CounterDrone.Core.Simulation.SimEvent;
+using CounterDrone.Core.Simulation;
 
 namespace CounterDrone.Unity
 {
diff --git a/test/unit/CounterDrone.Core.Tests/ReportGeneratorTests.cs b/test/unit/CounterDrone.Core.Tests/ReportGeneratorTests.cs
index 136b418..b111e52 100644
--- a/test/unit/CounterDrone.Core.Tests/ReportGeneratorTests.cs
+++ b/test/unit/CounterDrone.Core.Tests/ReportGeneratorTests.cs
@@ -3,7 +3,6 @@ using CounterDrone.Core.Models;
 using CounterDrone.Core.Services;
 using CounterDrone.Core.Simulation;
 using Xunit;
-using SimEvent = CounterDrone.Core.Simulation.SimEvent;
 
 namespace CounterDrone.Core.Tests
 {
diff --git a/test/unit/CounterDrone.Core.Tests/ReportServiceTests.cs b/test/unit/CounterDrone.Core.Tests/ReportServiceTests.cs
index 8ce8c3c..bd5b65a 100644
--- a/test/unit/CounterDrone.Core.Tests/ReportServiceTests.cs
+++ b/test/unit/CounterDrone.Core.Tests/ReportServiceTests.cs
@@ -7,7 +7,6 @@ using CounterDrone.Core.Services;
 using CounterDrone.Core.Simulation;
 using SQLite;
 using Xunit;
-using SimEvent = CounterDrone.Core.Simulation.SimEvent;
 
 namespace CounterDrone.Core.Tests
 {
diff --git a/test/unit/CounterDrone.Core.Tests/SimulationEngineTests.cs b/test/unit/CounterDrone.Core.Tests/SimulationEngineTests.cs
index cc0bbbc..deb0de9 100644
--- a/test/unit/CounterDrone.Core.Tests/SimulationEngineTests.cs
+++ b/test/unit/CounterDrone.Core.Tests/SimulationEngineTests.cs
@@ -9,7 +9,6 @@ using CounterDrone.Core.Repository;
 using CounterDrone.Core.Services;
 using CounterDrone.Core.Simulation;
 using Xunit;
-using SimEvent = CounterDrone.Core.Simulation.SimEvent;
 
 namespace CounterDrone.Core.Tests
 {