diff --git a/NzbDrone.Api/Commands/CommandConnection.cs b/NzbDrone.Api/Commands/CommandConnection.cs
index a09125734..1d9285d0b 100644
--- a/NzbDrone.Api/Commands/CommandConnection.cs
+++ b/NzbDrone.Api/Commands/CommandConnection.cs
@@ -20,17 +20,17 @@ namespace NzbDrone.Api.Commands
 
         public void HandleAsync(CommandStartedEvent message)
         {
-            BroadcastMessage(message.Command);
+            BroadcastMessage(message.TrackedCommand);
         }
 
         public void HandleAsync(CommandCompletedEvent message)
         {
-            BroadcastMessage(message.Command);
+            BroadcastMessage(message.TrackedCommand);
         }
 
         public void Handle(CommandFailedEvent message)
         {
-            BroadcastMessage(message.Command);
+            BroadcastMessage(message.TrackedCommand);
         }
 
         private void BroadcastMessage(TrackedCommand trackedCommand)
diff --git a/NzbDrone.Common/Messaging/Events/CommandCompletedEvent.cs b/NzbDrone.Common/Messaging/Events/CommandCompletedEvent.cs
index 2c1f4f312..f4831361e 100644
--- a/NzbDrone.Common/Messaging/Events/CommandCompletedEvent.cs
+++ b/NzbDrone.Common/Messaging/Events/CommandCompletedEvent.cs
@@ -4,11 +4,11 @@ namespace NzbDrone.Common.Messaging.Events
 {
     public class CommandCompletedEvent : IEvent
     {
-        public TrackedCommand Command { get; private set; }
+        public TrackedCommand TrackedCommand { get; private set; }
 
-        public CommandCompletedEvent(TrackedCommand command)
+        public CommandCompletedEvent(TrackedCommand trackedCommand)
         {
-            Command = command;
+            TrackedCommand = trackedCommand;
         }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Common/Messaging/Events/CommandExecutedEvent.cs b/NzbDrone.Common/Messaging/Events/CommandExecutedEvent.cs
index 8ed4b5f75..b93a5597c 100644
--- a/NzbDrone.Common/Messaging/Events/CommandExecutedEvent.cs
+++ b/NzbDrone.Common/Messaging/Events/CommandExecutedEvent.cs
@@ -4,11 +4,11 @@ namespace NzbDrone.Common.Messaging.Events
 {
     public class CommandExecutedEvent : IEvent
     {
-        public TrackedCommand Command { get; private set; }
+        public TrackedCommand TrackedCommand { get; private set; }
 
-        public CommandExecutedEvent(TrackedCommand command)
+        public CommandExecutedEvent(TrackedCommand trackedCommand)
         {
-            Command = command;
+            TrackedCommand = trackedCommand;
         }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Common/Messaging/Events/CommandFailedEvent.cs b/NzbDrone.Common/Messaging/Events/CommandFailedEvent.cs
index f796f0f03..5749ca00a 100644
--- a/NzbDrone.Common/Messaging/Events/CommandFailedEvent.cs
+++ b/NzbDrone.Common/Messaging/Events/CommandFailedEvent.cs
@@ -5,12 +5,12 @@ namespace NzbDrone.Common.Messaging.Events
 {
     public class CommandFailedEvent : IEvent
     {
-        public TrackedCommand Command { get; private set; }
+        public TrackedCommand TrackedCommand { get; private set; }
         public Exception Exception { get; private set; }
 
-        public CommandFailedEvent(TrackedCommand command, Exception exception)
+        public CommandFailedEvent(TrackedCommand trackedCommand, Exception exception)
         {
-            Command = command;
+            TrackedCommand = trackedCommand;
             Exception = exception;
         }
     }
diff --git a/NzbDrone.Common/Messaging/Events/CommandStartedEvent.cs b/NzbDrone.Common/Messaging/Events/CommandStartedEvent.cs
index 14296c02a..9247fbd45 100644
--- a/NzbDrone.Common/Messaging/Events/CommandStartedEvent.cs
+++ b/NzbDrone.Common/Messaging/Events/CommandStartedEvent.cs
@@ -4,11 +4,11 @@ namespace NzbDrone.Common.Messaging.Events
 {
     public class CommandStartedEvent : IEvent
     {
-        public TrackedCommand Command { get; private set; }
+        public TrackedCommand TrackedCommand { get; private set; }
 
-        public CommandStartedEvent(TrackedCommand command)
+        public CommandStartedEvent(TrackedCommand trackedCommand)
         {
-            Command = command;
+            TrackedCommand = trackedCommand;
         }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/Jobs/TaskManager.cs b/NzbDrone.Core/Jobs/TaskManager.cs
index 2f5314d1f..4dcfdd56c 100644
--- a/NzbDrone.Core/Jobs/TaskManager.cs
+++ b/NzbDrone.Core/Jobs/TaskManager.cs
@@ -79,7 +79,7 @@ namespace NzbDrone.Core.Jobs
 
         public void HandleAsync(CommandExecutedEvent message)
         {
-            var scheduledTask = _scheduledTaskRepository.All().SingleOrDefault(c => c.TypeName == message.Command.GetType().FullName);
+            var scheduledTask = _scheduledTaskRepository.All().SingleOrDefault(c => c.TypeName == message.TrackedCommand.Command.GetType().FullName);
 
             if (scheduledTask != null)
             {