diff --git a/src/libumskt/confid/confid.cpp b/src/libumskt/confid/confid.cpp
index 3554077..e594429 100644
--- a/src/libumskt/confid/confid.cpp
+++ b/src/libumskt/confid/confid.cpp
@@ -690,19 +690,19 @@ void ConfirmationID::decode_iid_new_version(unsigned char* iid, unsigned char* h
     QWORD hardwareIDVal = ((QWORD)v1 << 32) | v2;
     for (i = 0; i < 8; ++i)
         hwid[i] = (hardwareIDVal >> (8 * i)) & 0xFF;
-    unsigned __int32 v3 = ((buffer[0] & 0xFFFFFF80) >> 7) & 0xFFFFFFFF;
-    unsigned __int32 v4 = v3 & 0xFFFFF800;
-    unsigned __int32 v5 = buffer[1] & 0x7F;
-    unsigned __int32 v6 = buffer[1] >> 7;
-    unsigned __int32 v7 = ((v5 << 25) | v4) >> 11;
+    DWORD v3 = ((buffer[0] & 0xFFFFFF80) >> 7) & 0xFFFFFFFF;
+    DWORD v4 = v3 & 0xFFFFF800;
+    DWORD v5 = buffer[1] & 0x7F;
+    DWORD v6 = buffer[1] >> 7;
+    DWORD v7 = ((v5 << 25) | v4) >> 11;
     productID[1] = v7 & 0x000003FF;
-    unsigned __int32 v8 = v7 & 0xFFFFFC00;
-    unsigned __int32 v9 = (v6 >> 11) & 0x00001FFF;
-    unsigned __int32 v10 = v9 & 0x00001C00;
-    unsigned __int32 v11 = v9 & 0x000003FF;
-    unsigned __int32 v12 = (((v6 << 21) & 0xFFFFFFFF) | v8) >> 10;
-    unsigned __int32 v13 = (v11 << 22) & 0xFFFFFFFF;
-    unsigned __int32 v14 = v13 | v12;
+    DWORD v8 = v7 & 0xFFFFFC00;
+    DWORD v9 = (v6 >> 11) & 0x00001FFF;
+    DWORD v10 = v9 & 0x00001C00;
+    DWORD v11 = v9 & 0x000003FF;
+    DWORD = (((v6 << 21) & 0xFFFFFFFF) | v8) >> 10;
+    DWORD = (v11 << 22) & 0xFFFFFFFF;
+    DWORD = v13 | v12;
     productID[2] = v14 & 0x000FFFFF;
     productID[2] = calculateCheckDigit(productID[2]);
     productID[3] = (v14 & 0x3FF00000) >> 20;