diff --git a/include/dimm.hpp b/include/dimm.hpp
index 79da4cf..4230ae4 100644
--- a/include/dimm.hpp
+++ b/include/dimm.hpp
@@ -66,7 +66,7 @@
     void memoryInfoUpdate(void);
 
     uint16_t memoryDataWidth(uint16_t value) override;
-    uint32_t memorySizeInKB(uint32_t value) override;
+    size_t memorySizeInKB(size_t value) override;
     std::string memoryDeviceLocator(std::string value) override;
     DeviceType memoryType(DeviceType value) override;
     std::string memoryTypeDetail(std::string value) override;
@@ -84,7 +84,7 @@
     uint8_t* storage;
 
     void dimmSize(const uint16_t size);
-    void dimmSizeExt(const uint32_t size);
+    void dimmSizeExt(const size_t size);
     void dimmDeviceLocator(const uint8_t positionNum, const uint8_t structLen,
                            uint8_t* dataIn);
     void dimmType(const uint8_t type);
@@ -119,7 +119,7 @@
     uint8_t assetTag;
     uint8_t partNum;
     uint8_t attributes;
-    uint32_t extendedSize;
+    size_t extendedSize;
     uint16_t confClockSpeed;
     uint16_t minimumVoltage;
     uint16_t maximumVoltage;
diff --git a/include/system.hpp b/include/system.hpp
index cf69cb7..79f4eab 100644
--- a/include/system.hpp
+++ b/include/system.hpp
@@ -51,11 +51,11 @@
         path(objPath), storage(smbiosTableStorage)
     {
         std::string input = "0";
-        uUID(input);
+        uuid(input);
         version("0.00");
     }
 
-    std::string uUID(std::string value) override;
+    std::string uuid(std::string value) override;
 
     std::string version(std::string value) override;
 
@@ -102,7 +102,7 @@
         uint8_t productName;
         uint8_t version;
         uint8_t serialNum;
-        struct UUID uUID;
+        struct UUID uuid;
         uint8_t wakeupType;
         uint8_t skuNum;
         uint8_t family;