-#define EFI_SYSTEM_TABLE_SIGNATURE 0x5453595320494249ULL\r
-#define EFI_SYSTEM_TABLE_REVISION ((2<<16) | (10))\r
-#define EFI_2_10_SYSTEM_TABLE_REVISION ((2<<16) | (10))\r
-#define EFI_2_00_SYSTEM_TABLE_REVISION ((2<<16) | (00))\r
-#define EFI_1_10_SYSTEM_TABLE_REVISION ((1<<16) | (10))\r
-#define EFI_1_02_SYSTEM_TABLE_REVISION ((1<<16) | (02))\r
-\r
-#define EFI_RUNTIME_SERVICES_SIGNATURE 0x56524553544e5552ULL\r
-#define EFI_RUNTIME_SERVICES_REVISION EFI_2_10_SYSTEM_TABLE_REVISION\r
+#define EFI_SYSTEM_TABLE_SIGNATURE SIGNATURE_64 ('I','B','I',' ','S','Y','S','T')\r
+#define EFI_2_30_SYSTEM_TABLE_REVISION ((2 << 16) | (30))\r
+#define EFI_2_20_SYSTEM_TABLE_REVISION ((2 << 16) | (20))\r
+#define EFI_2_10_SYSTEM_TABLE_REVISION ((2 << 16) | (10))\r
+#define EFI_2_00_SYSTEM_TABLE_REVISION ((2 << 16) | (00))\r
+#define EFI_1_10_SYSTEM_TABLE_REVISION ((1 << 16) | (10))\r
+#define EFI_1_02_SYSTEM_TABLE_REVISION ((1 << 16) | (02))\r
+#define EFI_SYSTEM_TABLE_REVISION EFI_2_30_SYSTEM_TABLE_REVISION\r
+\r
+#define EFI_RUNTIME_SERVICES_SIGNATURE SIGNATURE_64 ('R','U','N','T','S','E','R','V')\r
+#define EFI_RUNTIME_SERVICES_REVISION EFI_2_30_SYSTEM_TABLE_REVISION\r