diff --git a/src/cpuinfo_main.cpp b/src/cpuinfo_main.cpp
index 78c82b5..7670bbd 100644
--- a/src/cpuinfo_main.cpp
+++ b/src/cpuinfo_main.cpp
@@ -56,7 +56,7 @@
     "xyz.openbmc_project.Smbios.MDR_V2";
 
 // constants for reading SSPEC or QDF string from PIROM
-// Currently, they are the same for platforms with icx
+// Currently, they are the same for platforms with Ice Lake
 static constexpr uint8_t defaultI2cBus = 13;
 static constexpr uint8_t defaultI2cSlaveAddr0 = 0x50;
 static constexpr uint8_t sspecRegAddr = 0xd;
@@ -409,13 +409,13 @@
 
     switch (model)
     {
-        case icx:
-        case icxd:
-        case spr:
-        case emr:
-        case gnr:
-        case gnrd:
-        case srf:
+        case iceLake:
+        case iceLakeD:
+        case sapphireRapids:
+        case emeraldRapids:
+        case graniteRapids:
+        case graniteRapidsD:
+        case sierraForest:
         {
             // PPIN can be read through PCS 19
             static constexpr uint8_t u8Size = 4; // default to a DWORD
diff --git a/src/sst_mailbox.cpp b/src/sst_mailbox.cpp
index b086c55..d31f6dc 100644
--- a/src/sst_mailbox.cpp
+++ b/src/sst_mailbox.cpp
@@ -44,7 +44,7 @@
         peciAddress(address), peciWoken(false), cpuModel(model),
         wakePolicy(wakePolicy_)
     {
-        mbBus = (model == icx) ? mbBusICX : mbBusOther;
+        mbBus = (model == iceLake) ? mbBusIceLake : mbBusOther;
     }
 
     ~PECIManager()
@@ -96,7 +96,7 @@
     }
 
     // PCode OS Mailbox interface register locations
-    static constexpr int mbBusICX = 14;
+    static constexpr int mbBusIceLake = 14;
     static constexpr int mbBusOther = 31;
     static constexpr int mbSegment = 0;
     static constexpr int mbDevice = 30;
@@ -414,8 +414,8 @@
     {
         switch (model)
         {
-            case spr:
-            case emr:
+            case sapphireRapids:
+            case emeraldRapids:
                 return true;
             default:
                 return false;
@@ -576,10 +576,10 @@
     DEBUG_PRINT << "createMailbox\n";
     switch (model)
     {
-        case icx:
-        case icxd:
-        case spr:
-        case emr:
+        case iceLake:
+        case iceLakeD:
+        case sapphireRapids:
+        case emeraldRapids:
             return std::make_unique<SSTMailbox>(address, model, wakePolicy);
         default:
             return nullptr;