diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino
index aff7661..82123fe 100644
--- a/examples/OneOpenAir/OneOpenAir.ino
+++ b/examples/OneOpenAir/OneOpenAir.ino
@@ -119,7 +119,7 @@ static bool ledBarButtonTest = false;
 static String fwNewVersion;
 
 SemaphoreHandle_t mutexMeasurementCycleQueue;
-static std::vector<Measurements::MeasurementCycle> measurementCycleQueue;
+static std::vector<Measurements::Measures> measurementCycleQueue;
 
 static void boardInit(void);
 static void initializeNetwork();
@@ -1327,7 +1327,7 @@ void postUsingCellular() {
   for (int i = 0; i < queueSize; i++) {
     auto mc = measurementCycleQueue.at(i);
     payload += ",";
-    payload += measurements.buildMeasurementPayload(mc);
+    payload += measurements.buildMeasuresPayload(mc);
   }
 
   // Release before actually post measures that might takes too long
@@ -1529,7 +1529,7 @@ void newMeasurementCycle() {
       measurementCycleQueue.erase(measurementCycleQueue.begin());
     }
 
-    Measurements::MeasurementCycle mc = measurements.getMeasurementCycle(); 
+    auto mc = measurements.getMeasures(); 
     measurementCycleQueue.push_back(mc);
     Serial.println("New measurement cycle added to queue");
     // Release mutex
diff --git a/src/AgOledDisplay.cpp b/src/AgOledDisplay.cpp
index 45e50e8..a620c82 100644
--- a/src/AgOledDisplay.cpp
+++ b/src/AgOledDisplay.cpp
@@ -5,16 +5,16 @@
 /** Cast U8G2 */
 #define DISP() ((U8G2_SH1106_128X64_NONAME_F_HW_I2C *)(this->u8g2))
 
-static const unsigned char wifi_issue_bits[] = {
+static const unsigned char WIFI_ISSUE_BITS[] = {
     0xd8, 0xc6, 0xde, 0xde, 0xc7, 0xf8, 0xd1, 0xe2, 0xdc, 0xce, 0xcc,
     0xcc, 0xc0, 0xc0, 0xd0, 0xc2, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0};
 
-static const unsigned char cloud_issue_bits[] = {
+static const unsigned char CLOUD_ISSUE_BITS[] = {
     0x70, 0xc0, 0x88, 0xc0, 0x04, 0xc1, 0x04, 0xcf, 0x02, 0xd0, 0x01,
     0xe0, 0x01, 0xe0, 0x01, 0xe0, 0xa2, 0xd0, 0x4c, 0xce, 0xa0, 0xc0};
 
 // Offline mode icon
-static unsigned char offline_bits[] = {
+static unsigned char OFFLINE_BITS[] = {
     0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x62, 0x00,
     0xE6, 0x00, 0xFE, 0x1F, 0xFE, 0x1F, 0xE6, 0x00, 0x62, 0x00,
     0x30, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -304,12 +304,12 @@ void OledDisplay::showDashboard(DashboardStatus status) {
         break;
       }
       case DashBoardStatusWiFiIssue: {
-        DISP()->drawXBM(icon_pos_x, 0, 14, 11, wifi_issue_bits);
+        DISP()->drawXBM(icon_pos_x, 0, 14, 11, WIFI_ISSUE_BITS);
         showTempHum(false);
         break;
       }
       case DashBoardStatusServerIssue: {
-        DISP()->drawXBM(icon_pos_x, 0, 14, 11, cloud_issue_bits);
+        DISP()->drawXBM(icon_pos_x, 0, 14, 11, CLOUD_ISSUE_BITS);
         showTempHum(false);
         break;
       }
@@ -322,7 +322,7 @@ void OledDisplay::showDashboard(DashboardStatus status) {
         break;
       }
       case DashBoardStatusOfflineMode: {
-        DISP()->drawXBM(icon_pos_x, 0, 14, 14, offline_bits);
+        DISP()->drawXBM(icon_pos_x, 0, 14, 14, OFFLINE_BITS);
         showTempHum(false); // First true
         break;
       }
diff --git a/src/AgValue.cpp b/src/AgValue.cpp
index fd5e5f0..4fe2af6 100644
--- a/src/AgValue.cpp
+++ b/src/AgValue.cpp
@@ -688,8 +688,8 @@ float Measurements::getCorrectedPM25(bool useAvg, int ch, bool forceCorrection)
   return corrected;
 }
 
-Measurements::MeasurementCycle Measurements::getMeasurementCycle() {
-  MeasurementCycle mc;
+Measurements::Measures Measurements::getMeasures() {
+  Measures mc;
   mc.bootCount = _bootCount;
   mc.freeHeap = ESP.getFreeHeap();
   // co2, tvoc, nox
@@ -734,7 +734,7 @@ Measurements::MeasurementCycle Measurements::getMeasurementCycle() {
   return mc;
 }
 
-std::string Measurements::buildMeasurementPayload(MeasurementCycle &mc) {
+std::string Measurements::buildMeasuresPayload(Measures &mc) {
   std::ostringstream oss;
 
   // CO2
diff --git a/src/AgValue.h b/src/AgValue.h
index 5edec72..1ea3309 100644
--- a/src/AgValue.h
+++ b/src/AgValue.h
@@ -38,7 +38,7 @@ public:
   Measurements(Configuration &config);
   ~Measurements() {}
 
-  struct MeasurementCycle {
+  struct Measures {
     float temperature[2];
     float humidity[2];
     float co2;
@@ -180,9 +180,9 @@ public:
    */
   String toString(bool localServer, AgFirmwareMode fwMode, int rssi);
 
-  MeasurementCycle getMeasurementCycle();
+  Measures getMeasures();
 
-  std::string buildMeasurementPayload(MeasurementCycle &mc);
+  std::string buildMeasuresPayload(Measures &measures);
 
   /**
    * Set to true if want to debug every update value