diff --git a/NucuCar.Sensors/Abstractions/GenericSensor.cs b/NucuCar.Sensors/Abstractions/GenericSensor.cs
index 3bde341..5be5eec 100644
--- a/NucuCar.Sensors/Abstractions/GenericSensor.cs
+++ b/NucuCar.Sensors/Abstractions/GenericSensor.cs
@@ -13,7 +13,7 @@ namespace NucuCar.Sensors.Abstractions
 
         public abstract void Initialize();
         public abstract Task TakeMeasurementAsync();
-        public abstract NucuCarSensorResponse GetMeasurement();
+        public abstract SensorResponse GetMeasurement();
         public abstract SensorStateEnum GetState();
     }
 }
\ No newline at end of file
diff --git a/NucuCar.Sensors/Abstractions/SensorResponse.cs b/NucuCar.Sensors/Abstractions/SensorResponse.cs
index 049484d..3a12360 100644
--- a/NucuCar.Sensors/Abstractions/SensorResponse.cs
+++ b/NucuCar.Sensors/Abstractions/SensorResponse.cs
@@ -2,9 +2,8 @@
 
 namespace NucuCar.Sensors.Abstractions
 {
-    public class NucuCarSensorResponse
+    public class SensorResponse
     {
-        // TODO: Fix names in NucuCar.Sensors.Modules.
         public SensorStateEnum State;
         public string SensorId;
         public List<SensorMeasurement> Data;
diff --git a/NucuCar.Sensors/Modules/Environment/Bme680Sensor.cs b/NucuCar.Sensors/Modules/Environment/Bme680Sensor.cs
index 85b3376..d1a6eca 100644
--- a/NucuCar.Sensors/Modules/Environment/Bme680Sensor.cs
+++ b/NucuCar.Sensors/Modules/Environment/Bme680Sensor.cs
@@ -51,9 +51,9 @@ namespace NucuCar.Sensors.Modules.Environment
             Object = this;
         }
 
-        public override NucuCarSensorResponse GetMeasurement()
+        public override SensorResponse GetMeasurement()
         {
-            return new NucuCarSensorResponse
+            return new SensorResponse
             {
                 SensorId = GetIdentifier(),
                 State = GetState(),
diff --git a/NucuCar.Sensors/Modules/Health/CpuTempSensor.cs b/NucuCar.Sensors/Modules/Health/CpuTempSensor.cs
index 1ef2024..a877501 100644
--- a/NucuCar.Sensors/Modules/Health/CpuTempSensor.cs
+++ b/NucuCar.Sensors/Modules/Health/CpuTempSensor.cs
@@ -62,9 +62,9 @@ namespace NucuCar.Sensors.Modules.Health
             return Task.FromResult(_lastTemperatureCelsius);
         }
 
-        public override NucuCarSensorResponse GetMeasurement()
+        public override SensorResponse GetMeasurement()
         {
-            return new NucuCarSensorResponse()
+            return new SensorResponse()
             {
                 SensorId = GetIdentifier(),
                 State = CurrentState,
diff --git a/NucuCar.Sensors/Modules/Heartbeat/HeartbeatSensor.cs b/NucuCar.Sensors/Modules/Heartbeat/HeartbeatSensor.cs
index a9f55f1..64a5d61 100644
--- a/NucuCar.Sensors/Modules/Heartbeat/HeartbeatSensor.cs
+++ b/NucuCar.Sensors/Modules/Heartbeat/HeartbeatSensor.cs
@@ -39,9 +39,9 @@ namespace NucuCar.Sensors.Modules.Heartbeat
             return Task.CompletedTask;
         }
 
-        public override NucuCarSensorResponse GetMeasurement()
+        public override SensorResponse GetMeasurement()
         {
-            return new NucuCarSensorResponse()
+            return new SensorResponse()
             {
                 SensorId = GetIdentifier(),
                 State = CurrentState,
diff --git a/NucuCar.Sensors/Modules/PMS5003/Pms5003Sensor.cs b/NucuCar.Sensors/Modules/PMS5003/Pms5003Sensor.cs
index d44cd59..c8f6d76 100644
--- a/NucuCar.Sensors/Modules/PMS5003/Pms5003Sensor.cs
+++ b/NucuCar.Sensors/Modules/PMS5003/Pms5003Sensor.cs
@@ -82,9 +82,9 @@ namespace NucuCar.Sensors.Modules.PMS5003
             return Task.CompletedTask;
         }
 
-        public override NucuCarSensorResponse GetMeasurement()
+        public override SensorResponse GetMeasurement()
         {
-            return new NucuCarSensorResponse()
+            return new SensorResponse()
             {
                 SensorId = GetIdentifier(),
                 State = GetState(),
diff --git a/NucuCar.UnitTests/NucuCar.Sensors.Tests/EnvironmentSensor/TestBme680Sensor.cs b/NucuCar.UnitTests/NucuCar.Sensors.Tests/EnvironmentSensor/TestBme680Sensor.cs
index 762d809..09e86d8 100644
--- a/NucuCar.UnitTests/NucuCar.Sensors.Tests/EnvironmentSensor/TestBme680Sensor.cs
+++ b/NucuCar.UnitTests/NucuCar.Sensors.Tests/EnvironmentSensor/TestBme680Sensor.cs
@@ -16,9 +16,9 @@ namespace NucuCar.UnitTests.NucuCar.Sensors.Tests.EnvironmentSensor
             
         }
         
-        public override NucuCarSensorResponse GetMeasurement()
+        public override SensorResponse GetMeasurement()
         {
-            return new NucuCarSensorResponse();
+            return new SensorResponse();
         }
         
         public override SensorStateEnum GetState()