diff --git a/xtoskrnl/includes/amd64/ar.h b/xtoskrnl/includes/amd64/ari.h
similarity index 96%
rename from xtoskrnl/includes/amd64/ar.h
rename to xtoskrnl/includes/amd64/ari.h
index 96d7fa2b..197e51f9 100644
--- a/xtoskrnl/includes/amd64/ar.h
+++ b/xtoskrnl/includes/amd64/ari.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/amd64/ar.h
+ * FILE:            xtoskrnl/includes/amd64/ari.h
  * DESCRIPTION:     AMD64 architecture library routines
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_AMD64_AR_H
-#define __XTOSKRNL_AMD64_AR_H
+#ifndef __XTOSKRNL_AMD64_ARI_H
+#define __XTOSKRNL_AMD64_ARI_H
 
 #include <xtos.h>
 
@@ -288,4 +288,4 @@ ArpSetIdtGate(IN PKIDTENTRY Idt,
               IN USHORT Ist,
               IN USHORT Access);
 
-#endif /* __XTOSKRNL_AMD64_AR_H */
+#endif /* __XTOSKRNL_AMD64_ARI_H */
diff --git a/xtoskrnl/includes/amd64/hl.h b/xtoskrnl/includes/amd64/hli.h
similarity index 84%
rename from xtoskrnl/includes/amd64/hl.h
rename to xtoskrnl/includes/amd64/hli.h
index a6749d9f..1e079205 100644
--- a/xtoskrnl/includes/amd64/hl.h
+++ b/xtoskrnl/includes/amd64/hli.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/amd64/hl.h
+ * FILE:            xtoskrnl/includes/amd64/hli.h
  * DESCRIPTION:     XT hardware abstraction layer routines specific to AMD64 architecture
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_AMD64_HL_H
-#define __XTOSKRNL_AMD64_HL_H
+#ifndef __XTOSKRNL_AMD64_HLI_H
+#define __XTOSKRNL_AMD64_HLI_H
 
 #include <xtos.h>
 
@@ -50,4 +50,4 @@ XTFASTCALL
 UCHAR
 HlpTransformRunLevelToApicTpr(IN KRUNLEVEL RunLevel);
 
-#endif /* __XTOSKRNL_AMD64_HL_H */
+#endif /* __XTOSKRNL_AMD64_HLI_H */
diff --git a/xtoskrnl/includes/amd64/ke.h b/xtoskrnl/includes/amd64/kei.h
similarity index 87%
rename from xtoskrnl/includes/amd64/ke.h
rename to xtoskrnl/includes/amd64/kei.h
index 1b5ac7b1..976eacea 100644
--- a/xtoskrnl/includes/amd64/ke.h
+++ b/xtoskrnl/includes/amd64/kei.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/amd64/ke.h
+ * FILE:            xtoskrnl/includes/amd64/kei.h
  * DESCRIPTION:     XTOS kernel services routine definitions specific to AMD64 architecture
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_AMD64_KE_H
-#define __XTOSKRNL_AMD64_KE_H
+#ifndef __XTOSKRNL_AMD64_KEI_H
+#define __XTOSKRNL_AMD64_KEI_H
 
 #include <xtos.h>
 
@@ -53,4 +53,4 @@ XTAPI
 VOID
 KepSwitchBootStack(IN ULONG_PTR Stack);
 
-#endif /* __XTOSKRNL_AMD64_KE_H */
+#endif /* __XTOSKRNL_AMD64_KEI_H */
diff --git a/xtoskrnl/includes/amd64/mm.h b/xtoskrnl/includes/amd64/mmi.h
similarity index 72%
rename from xtoskrnl/includes/amd64/mm.h
rename to xtoskrnl/includes/amd64/mmi.h
index ea2e8073..b52e7b6d 100644
--- a/xtoskrnl/includes/amd64/mm.h
+++ b/xtoskrnl/includes/amd64/mmi.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/amd64/mm.h
+ * FILE:            xtoskrnl/includes/amd64/mmi.h
  * DESCRIPTION:     XT memory manager routines specific to AMD64 architecture
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_AMD64_MM_H
-#define __XTOSKRNL_AMD64_MM_H
+#ifndef __XTOSKRNL_AMD64_MMI_H
+#define __XTOSKRNL_AMD64_MMI_H
 
 #include <xtos.h>
 
@@ -18,4 +18,4 @@ VOID
 MmZeroPages(IN PVOID Address,
             IN ULONG Size);
 
-#endif /* __XTOSKRNL_AMD64_MM_H */
+#endif /* __XTOSKRNL_AMD64_MMI_H */
diff --git a/xtoskrnl/includes/amd64/rtl.h b/xtoskrnl/includes/amd64/rtli.h
similarity index 74%
rename from xtoskrnl/includes/amd64/rtl.h
rename to xtoskrnl/includes/amd64/rtli.h
index 52cdb2a9..d9d187d9 100644
--- a/xtoskrnl/includes/amd64/rtl.h
+++ b/xtoskrnl/includes/amd64/rtli.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/amd64/rtl.h
+ * FILE:            xtoskrnl/includes/amd64/rtli.h
  * DESCRIPTION:     XT runtime library routines specific to AMD64 architecture
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_AMD64_RTL_H
-#define __XTOSKRNL_AMD64_RTL_H
+#ifndef __XTOSKRNL_AMD64_RTLI_H
+#define __XTOSKRNL_AMD64_RTLI_H
 
 #include <xtos.h>
 
@@ -18,4 +18,4 @@ VOID
 RtlGetStackLimits(OUT PULONG_PTR StackBase,
                   OUT PULONG_PTR StackLimit);
 
-#endif /* __XTOSKRNL_AMD64_RTL_H */
+#endif /* __XTOSKRNL_AMD64_RTLI_H */
diff --git a/xtoskrnl/includes/hl.h b/xtoskrnl/includes/hli.h
similarity index 89%
rename from xtoskrnl/includes/hl.h
rename to xtoskrnl/includes/hli.h
index 423511fb..0a7f0d73 100644
--- a/xtoskrnl/includes/hl.h
+++ b/xtoskrnl/includes/hli.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/hl.h
+ * FILE:            xtoskrnl/includes/hli.h
  * DESCRIPTION:     XT hardware abstraction layer routines
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_HL_H
-#define __XTOSKRNL_HL_H
+#ifndef __XTOSKRNL_HLI_H
+#define __XTOSKRNL_HLI_H
 
 #include <xtos.h>
 
@@ -63,4 +63,4 @@ XTAPI
 VOID
 HlInitializeProcessor(VOID);
 
-#endif /* __XTOSKRNL_HL_H */
+#endif /* __XTOSKRNL_HLI_H */
diff --git a/xtoskrnl/includes/i686/ar.h b/xtoskrnl/includes/i686/ari.h
similarity index 96%
rename from xtoskrnl/includes/i686/ar.h
rename to xtoskrnl/includes/i686/ari.h
index c127954d..7055b3a2 100644
--- a/xtoskrnl/includes/i686/ar.h
+++ b/xtoskrnl/includes/i686/ari.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/i686/ar.h
+ * FILE:            xtoskrnl/includes/i686/ari.h
  * DESCRIPTION:     I686 architecture library routines
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_I686_AR_H
-#define __XTOSKRNL_I686_AR_H
+#ifndef __XTOSKRNL_I686_ARI_H
+#define __XTOSKRNL_I686_ARI_H
 
 #include <xtos.h>
 
@@ -284,4 +284,4 @@ XTAPI
 VOID
 ArpSetNonMaskableInterruptTssEntry(IN PKPROCESSOR_BLOCK ProcessorBlock);
 
-#endif /* __XTOSKRNL_I686_AR_H */
+#endif /* __XTOSKRNL_I686_ARI_H */
diff --git a/xtoskrnl/includes/i686/hl.h b/xtoskrnl/includes/i686/hli.h
similarity index 85%
rename from xtoskrnl/includes/i686/hl.h
rename to xtoskrnl/includes/i686/hli.h
index 12b17a78..4c5bcf52 100644
--- a/xtoskrnl/includes/i686/hl.h
+++ b/xtoskrnl/includes/i686/hli.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/i686/hl.h
+ * FILE:            xtoskrnl/includes/i686/hli.h
  * DESCRIPTION:     XT hardware abstraction layer routines specific to i686 architecture
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_I686_HL_H
-#define __XTOSKRNL_I686_HL_H
+#ifndef __XTOSKRNL_I686_HLI_H
+#define __XTOSKRNL_I686_HLI_H
 
 #include <xtos.h>
 
@@ -50,4 +50,4 @@ XTFASTCALL
 UCHAR
 HlpTransformRunLevelToApicTpr(IN KRUNLEVEL RunLevel);
 
-#endif /* __XTOSKRNL_I686_HL_H */
+#endif /* __XTOSKRNL_I686_HLI_H */
diff --git a/xtoskrnl/includes/i686/ke.h b/xtoskrnl/includes/i686/kei.h
similarity index 87%
rename from xtoskrnl/includes/i686/ke.h
rename to xtoskrnl/includes/i686/kei.h
index 06787165..379735ac 100644
--- a/xtoskrnl/includes/i686/ke.h
+++ b/xtoskrnl/includes/i686/kei.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/i686/ke.h
+ * FILE:            xtoskrnl/includes/i686/kei.h
  * DESCRIPTION:     XTOS kernel services routine definitions specific to i686 architecture
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_I686_KE_H
-#define __XTOSKRNL_I686_KE_H
+#ifndef __XTOSKRNL_I686_KEI_H
+#define __XTOSKRNL_I686_KEI_H
 
 #include <xtos.h>
 
@@ -53,4 +53,4 @@ XTAPI
 VOID
 KepSwitchBootStack(IN ULONG_PTR Stack);
 
-#endif /* __XTOSKRNL_I686_KE_H */
+#endif /* __XTOSKRNL_I686_KEI_H */
diff --git a/xtoskrnl/includes/i686/mm.h b/xtoskrnl/includes/i686/mmi.h
similarity index 73%
rename from xtoskrnl/includes/i686/mm.h
rename to xtoskrnl/includes/i686/mmi.h
index e4cbcfe5..55b43e9c 100644
--- a/xtoskrnl/includes/i686/mm.h
+++ b/xtoskrnl/includes/i686/mmi.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/i686/mm.h
+ * FILE:            xtoskrnl/includes/i686/mmi.h
  * DESCRIPTION:     XT memory manager routines specific to i686 architecture
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_I686_MM_H
-#define __XTOSKRNL_I686_MM_H
+#ifndef __XTOSKRNL_I686_MMI_H
+#define __XTOSKRNL_I686_MMI_H
 
 #include <xtos.h>
 
@@ -18,4 +18,4 @@ VOID
 MmZeroPages(IN PVOID Address,
             IN ULONG Size);
 
-#endif /* __XTOSKRNL_I686_MM_H */
+#endif /* __XTOSKRNL_I686_MMI_H */
diff --git a/xtoskrnl/includes/i686/rtl.h b/xtoskrnl/includes/i686/rtli.h
similarity index 74%
rename from xtoskrnl/includes/i686/rtl.h
rename to xtoskrnl/includes/i686/rtli.h
index b4d440e8..d7fd287e 100644
--- a/xtoskrnl/includes/i686/rtl.h
+++ b/xtoskrnl/includes/i686/rtli.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/i686/rtl.h
+ * FILE:            xtoskrnl/includes/i686/rtli.h
  * DESCRIPTION:     XT runtime library routines specific to i686 architecture
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_I686_RTL_H
-#define __XTOSKRNL_I686_RTL_H
+#ifndef __XTOSKRNL_I686_RTLI_H
+#define __XTOSKRNL_I686_RTLI_H
 
 #include <xtos.h>
 
@@ -18,4 +18,4 @@ VOID
 RtlGetStackLimits(OUT PULONG_PTR StackBase,
                   OUT PULONG_PTR StackLimit);
 
-#endif /* __XTOSKRNL_I686_RTL_H */
+#endif /* __XTOSKRNL_I686_RTLI_H */
diff --git a/xtoskrnl/includes/ke.h b/xtoskrnl/includes/kei.h
similarity index 94%
rename from xtoskrnl/includes/ke.h
rename to xtoskrnl/includes/kei.h
index 0b49d997..eb168660 100644
--- a/xtoskrnl/includes/ke.h
+++ b/xtoskrnl/includes/kei.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/ke.h
+ * FILE:            xtoskrnl/includes/kei.h
  * DESCRIPTION:     XTOS kernel services routine definitions
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_KE_H
-#define __XTOSKRNL_KE_H
+#ifndef __XTOSKRNL_KEI_H
+#define __XTOSKRNL_KEI_H
 
 #include <xtos.h>
 
@@ -112,4 +112,4 @@ KepSuspendThread(IN PVOID NormalContext,
                  IN PVOID SystemArgument1,
                  IN PVOID SystemArgument2);
 
-#endif /* __XTOSKRNL_KE_H */
+#endif /* __XTOSKRNL_KEI_H */
diff --git a/xtoskrnl/includes/mm.h b/xtoskrnl/includes/mmi.h
similarity index 80%
rename from xtoskrnl/includes/mm.h
rename to xtoskrnl/includes/mmi.h
index 8d62f0f6..528ec405 100644
--- a/xtoskrnl/includes/mm.h
+++ b/xtoskrnl/includes/mmi.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/mm.h
+ * FILE:            xtoskrnl/includes/mmi.h
  * DESCRIPTION:     Memory manager routines
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_MM_H
-#define __XTOSKRNL_MM_H
+#ifndef __XTOSKRNL_MMI_H
+#define __XTOSKRNL_MMI_H
 
 #include <xtos.h>
 
@@ -24,4 +24,4 @@ VOID
 MmFreeKernelStack(IN PVOID Stack,
                   IN BOOLEAN LargeStack);
 
-#endif /* __XTOSKRNL_MM_H */
+#endif /* __XTOSKRNL_MMI_H */
diff --git a/xtoskrnl/includes/po.h b/xtoskrnl/includes/poi.h
similarity index 84%
rename from xtoskrnl/includes/po.h
rename to xtoskrnl/includes/poi.h
index 2f9118e7..a53e03b4 100644
--- a/xtoskrnl/includes/po.h
+++ b/xtoskrnl/includes/poi.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/po.h
+ * FILE:            xtoskrnl/includes/poi.h
  * DESCRIPTION:     Power manager subsystem routines
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_PO_H
-#define __XTOSKRNL_PO_H
+#ifndef __XTOSKRNL_POI_H
+#define __XTOSKRNL_POI_H
 
 #include <xtos.h>
 
@@ -32,4 +32,4 @@ PopPerfIdleDpc(IN PKDPC Dpc,
                IN PVOID SystemArgument1,
                IN PVOID SystemArgument2);
 
-#endif /* __XTOSKRNL_PO_H */
+#endif /* __XTOSKRNL_POI_H */
diff --git a/xtoskrnl/includes/rtl.h b/xtoskrnl/includes/rtli.h
similarity index 97%
rename from xtoskrnl/includes/rtl.h
rename to xtoskrnl/includes/rtli.h
index 8a922994..618aa8a6 100644
--- a/xtoskrnl/includes/rtl.h
+++ b/xtoskrnl/includes/rtli.h
@@ -1,13 +1,13 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/includes/rtl.h
+ * FILE:            xtoskrnl/includes/rtli.h
  * DESCRIPTION:     XT runtime library routines
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTOSKRNL_RTL_H
-#define __XTOSKRNL_RTL_H
+#ifndef __XTOSKRNL_RTLI_H
+#define __XTOSKRNL_RTLI_H
 
 #include <xtos.h>
 
@@ -235,4 +235,4 @@ XTCDECL
 VOID
 RtlRemoveEntryList(IN PLIST_ENTRY Entry);
 
-#endif /* __XTOSKRNL_RTL_H */
+#endif /* __XTOSKRNL_RTLI_H */
diff --git a/xtoskrnl/includes/xtos.h b/xtoskrnl/includes/xtos.h
index df42c822..744c5105 100644
--- a/xtoskrnl/includes/xtos.h
+++ b/xtoskrnl/includes/xtos.h
@@ -14,15 +14,15 @@
 
 /* Kernel specific headers */
 #include "globals.h"
-#include "hl.h"
-#include "ke.h"
-#include "mm.h"
-#include "po.h"
-#include "rtl.h"
+#include "hli.h"
+#include "kei.h"
+#include "mmi.h"
+#include "poi.h"
+#include "rtli.h"
 
 #include ARCH_HEADER(globals.h)
-#include ARCH_HEADER(ar.h)
-#include ARCH_HEADER(hl.h)
-#include ARCH_HEADER(ke.h)
-#include ARCH_HEADER(mm.h)
-#include ARCH_HEADER(rtl.h)
+#include ARCH_HEADER(ari.h)
+#include ARCH_HEADER(hli.h)
+#include ARCH_HEADER(kei.h)
+#include ARCH_HEADER(mmi.h)
+#include ARCH_HEADER(rtli.h)