2 files changed, 6 insertions, 5 deletions
diff --git a/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs
index f3642bebe..69400cfe7 100644
--- a/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operators/IMachineOperator.cs
@@ -13,7 +13,7 @@ namespace Tango.Integration.Operators
         /// <summary>
         /// Occurs when there is new diagnostics data available.
         /// </summary>
-        event EventHandler<StartDiagnosticsResponse> DiagnosticsDataAvailable;
+        event EventHandler<PushDiagnosticsResponse> DiagnosticsDataAvailable;
 
         /// <summary>
         /// Gets or sets a value indicating whether to enable diagnostics messages by requesting diagnostics messages.
diff --git a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
index 68f68d47c..17884b677 100644
--- a/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operators/MachineOperator.cs
@@ -10,6 +10,7 @@ using Tango.Transport.Transporters;
 using System.Reactive.Linq;
 using System.Reactive.Concurrency;
 using System.Reactive.Threading;
+using Tango.PMR.Common;
 
 namespace Tango.Integration.Operators
 {
@@ -18,7 +19,7 @@ namespace Tango.Integration.Operators
         /// <summary>
         /// Occurs when there is new diagnostics data available.
         /// </summary>
-        public event EventHandler<StartDiagnosticsResponse> DiagnosticsDataAvailable;
+        public event EventHandler<PushDiagnosticsResponse> DiagnosticsDataAvailable;
 
         private bool _enableDiagnostics;
         /// <summary>
@@ -46,12 +47,12 @@ namespace Tango.Integration.Operators
         {
             if (value && State == TransportComponentState.Connected)
             {
-                SendContinuousRequest<StartDiagnosticsRequest, StartDiagnosticsResponse>(new TangoMessage<StartDiagnosticsRequest>(new StartDiagnosticsRequest()
+                SendContinuousRequest<PushDiagnosticsRequest, PushDiagnosticsResponse>(new TangoMessage<PushDiagnosticsRequest>(new PushDiagnosticsRequest()
                 {
                     PushMotors = true,
                     PushSensors = true,
 
-                }, PMR.Common.MessageType.StartDiagnosticsRequest)).ObserveOn(new NewThreadScheduler()).Subscribe(
+                }, MessageType.PushDiagnosticsRequest)).ObserveOn(new NewThreadScheduler()).Subscribe(
                     (response) =>
                     {
                         OnDiagnosticsDataAvailable(response);
@@ -71,7 +72,7 @@ namespace Tango.Integration.Operators
         /// Invokes the <see cref="DiagnosticsDataAvailable"/> event.
         /// </summary>
         /// <param name="data">The sensors data.</param>
-        protected virtual void OnDiagnosticsDataAvailable(StartDiagnosticsResponse data)
+        protected virtual void OnDiagnosticsDataAvailable(PushDiagnosticsResponse data)
         {
             DiagnosticsDataAvailable?.Invoke(this, data);
         }