diff --git a/selutility.cpp b/selutility.cpp
index f52d51e..b4675d1 100644
--- a/selutility.cpp
+++ b/selutility.cpp
@@ -27,7 +27,7 @@
         const std::string& objPath,
         ipmi::sensor::InvObjectIDMap::const_iterator iter)
 {
-    ipmi::sel::GetSELEntryResponse record {};
+    GetSELEntryResponse record {};
 
     sdbusplus::bus::bus bus{ipmid_get_sd_bus_connection()};
     auto service = ipmi::getService(bus, logEntryIntf, objPath);
@@ -46,7 +46,7 @@
         elog<InternalFailure>();
     }
 
-    std::map<std::string, PropertyType> entryData;
+    std::map<PropertyName, PropertyType> entryData;
     reply.read(entryData);
 
     // Read Id from the log entry.
diff --git a/selutility.hpp b/selutility.hpp
index 164ebe6..57ed24f 100644
--- a/selutility.hpp
+++ b/selutility.hpp
@@ -21,8 +21,14 @@
 static constexpr auto propIntf = "org.freedesktop.DBus.Properties";
 
 using ObjectPaths = std::vector<std::string>;
-using PropertyType = sdbusplus::message::variant<bool, uint32_t, uint64_t,
-                     std::string, std::vector<std::string>>;
+using PropertyName = std::string;
+using Resolved = bool;
+using Id = uint32_t;
+using Timestamp = uint64_t;
+using Message = std::string;
+using AdditionalData = std::vector<std::string>;
+using PropertyType = sdbusplus::message::variant<Resolved, Id, Timestamp,
+                     Message, AdditionalData>;
 
 static constexpr auto selVersion = 0x51;
 static constexpr auto invalidTimeStamp = 0xFFFFFFFF;