diff --git a/sdk/xtdk/xtbmapi.h b/sdk/xtdk/xtblapi.h
similarity index 100%
rename from sdk/xtdk/xtbmapi.h
rename to sdk/xtdk/xtblapi.h
diff --git a/xtldr2/config.c b/xtldr2/config.c
index 2c8ac23..beb72cc 100644
--- a/xtldr2/config.c
+++ b/xtldr2/config.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtbm.h>
+#include <xtldr.h>
 
 
 /**
diff --git a/xtldr2/console.c b/xtldr2/console.c
index d96ab94..b4d7388 100644
--- a/xtldr2/console.c
+++ b/xtldr2/console.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtbm.h>
+#include <xtldr.h>
 
 
 /**
diff --git a/xtldr2/globals.c b/xtldr2/globals.c
index 14277ac..844833c 100644
--- a/xtldr2/globals.c
+++ b/xtldr2/globals.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtbm.h>
+#include <xtldr.h>
 
 
 /* XT Boot Loader configuration data */
diff --git a/xtldr2/hardware.c b/xtldr2/hardware.c
index 8cf2a47..9824cc2 100644
--- a/xtldr2/hardware.c
+++ b/xtldr2/hardware.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtbm.h>
+#include <xtldr.h>
 
 
 /**
diff --git a/xtldr2/includes/bootman.h b/xtldr2/includes/bootman.h
index a4665fa..73abcb5 100644
--- a/xtldr2/includes/bootman.h
+++ b/xtldr2/includes/bootman.h
@@ -1,7 +1,7 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtldr/includes/xtbm.h
+ * FILE:            xtldr/includes/bootman.h
  * DESCRIPTION:     XTLDR Boot Loader related structures and routines forward references
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
@@ -9,7 +9,7 @@
 #ifndef __XTLDR_BOOTMAN_H
 #define __XTLDR_BOOTMAN_H
 
-#include <xtbmapi.h>
+#include <xtblapi.h>
 
 
 /* XTLDR routine callbacks */
diff --git a/xtldr2/includes/globals.h b/xtldr2/includes/globals.h
index d9e1419..3ac01d9 100644
--- a/xtldr2/includes/globals.h
+++ b/xtldr2/includes/globals.h
@@ -1,7 +1,7 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtldr/includes/xtbm.h
+ * FILE:            xtldr/includes/globals.h
  * DESCRIPTION:     XTLDR global variables
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
@@ -9,7 +9,7 @@
 #ifndef __XTLDR_GLOBALS_H
 #define __XTLDR_GLOBALS_H
 
-#include <xtbmapi.h>
+#include <xtblapi.h>
 
 
 /* XT Boot Loader configuration data */
diff --git a/xtldr2/includes/xtbm.h b/xtldr2/includes/xtldr.h
similarity index 66%
rename from xtldr2/includes/xtbm.h
rename to xtldr2/includes/xtldr.h
index 7a9c9d4..497b0b1 100644
--- a/xtldr2/includes/xtbm.h
+++ b/xtldr2/includes/xtldr.h
@@ -1,18 +1,18 @@
 /**
  * PROJECT:         ExectOS
  * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtldr/includes/xtbm.h
+ * FILE:            xtldr/includes/xtldr.h
  * DESCRIPTION:     Top level header for XTLDR
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#ifndef __XTLDR_XTBM_H
-#define __XTLDR_XTBM_H
+#ifndef __XTLDR_XTLDR_H
+#define __XTLDR_XTLDR_H
 
-#include <xtbmapi.h>
+#include <xtblapi.h>
 #include <xtver.h>
 
 #include <globals.h>
 #include <bootman.h>
 
-#endif /* __XTLDR_XTBM_H */
+#endif /* __XTLDR_XTLDR_H */
diff --git a/xtldr2/memory.c b/xtldr2/memory.c
index 6ef6998..a91a99e 100644
--- a/xtldr2/memory.c
+++ b/xtldr2/memory.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtbm.h>
+#include <xtldr.h>
 
 
 /**
diff --git a/xtldr2/string.c b/xtldr2/string.c
index 58b0d86..991fbce 100644
--- a/xtldr2/string.c
+++ b/xtldr2/string.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtbm.h>
+#include <xtldr.h>
 
 
 /**
diff --git a/xtldr2/xtldr.c b/xtldr2/xtldr.c
index 8a6bb3f..9a8eeb5 100644
--- a/xtldr2/xtldr.c
+++ b/xtldr2/xtldr.c
@@ -6,7 +6,7 @@
  * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
  */
 
-#include <xtbm.h>
+#include <xtldr.h>
 
 
 /**