diff --git a/src/hci/mucurses/clear.c b/src/hci/mucurses/clear.c
index a32f693f..b4382c59 100644
--- a/src/hci/mucurses/clear.c
+++ b/src/hci/mucurses/clear.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "core.h"
+#include "mucurses.h"
 #include "cursor.h"
 
 /** @file
diff --git a/src/hci/mucurses/edging.c b/src/hci/mucurses/edging.c
index 2cbf7650..eccd3242 100644
--- a/src/hci/mucurses/edging.c
+++ b/src/hci/mucurses/edging.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "core.h"
+#include "mucurses.h"
 #include "cursor.h"
 
 /** @file
diff --git a/src/hci/mucurses/kb.c b/src/hci/mucurses/kb.c
index 1d02a0c8..8c38f1f8 100644
--- a/src/hci/mucurses/kb.c
+++ b/src/hci/mucurses/kb.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <timer.h>
 #include <console.h>
-#include "core.h"
+#include "mucurses.h"
 
 /** @file
  *
diff --git a/src/hci/mucurses/mucurses.c b/src/hci/mucurses/mucurses.c
index deadc5d4..c574a26c 100644
--- a/src/hci/mucurses/mucurses.c
+++ b/src/hci/mucurses/mucurses.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "core.h"
+#include "mucurses.h"
 
 /** @file
  *
diff --git a/src/hci/mucurses/core.h b/src/hci/mucurses/mucurses.h
similarity index 85%
rename from src/hci/mucurses/core.h
rename to src/hci/mucurses/mucurses.h
index 7d77681e..db6cf587 100644
--- a/src/hci/mucurses/core.h
+++ b/src/hci/mucurses/mucurses.h
@@ -1,5 +1,5 @@
-#ifndef CORE_H
-#define CORE_H
+#ifndef _MUCURSES_H
+#define _MUCURSES_H
 
 /** @file
  *
@@ -16,4 +16,4 @@ void _wputstr ( WINDOW *win, const char *str, int wrap, int n );
 void _wcursback ( WINDOW *win );
 int wmove ( WINDOW *win, int y, int x );
 
-#endif /* CURSES_H */
+#endif /* _MUCURSES_H */
diff --git a/src/hci/mucurses/print.c b/src/hci/mucurses/print.c
index c41c34d0..dd9e299c 100644
--- a/src/hci/mucurses/print.c
+++ b/src/hci/mucurses/print.c
@@ -1,7 +1,7 @@
 #include <curses.h>
 #include <vsprintf.h>
 #include <stddef.h>
-#include "core.h"
+#include "mucurses.h"
 
 /** @file
  *
diff --git a/src/hci/mucurses/print_nadv.c b/src/hci/mucurses/print_nadv.c
index 9b393f01..ee472e68 100644
--- a/src/hci/mucurses/print_nadv.c
+++ b/src/hci/mucurses/print_nadv.c
@@ -1,5 +1,5 @@
 #include <curses.h>
-#include "core.h"
+#include "mucurses.h"
 #include "cursor.h"
 
 /** @file
diff --git a/src/hci/mucurses/slk.c b/src/hci/mucurses/slk.c
index ea11c0da..36063a0b 100644
--- a/src/hci/mucurses/slk.c
+++ b/src/hci/mucurses/slk.c
@@ -2,7 +2,7 @@
 #include <stddef.h>
 #include <malloc.h>
 #include <string.h>
-#include "core.h"
+#include "mucurses.h"
 
 /** @file
  *
diff --git a/src/hci/mucurses/windows.c b/src/hci/mucurses/windows.c
index 06a88e02..c1a3a931 100644
--- a/src/hci/mucurses/windows.c
+++ b/src/hci/mucurses/windows.c
@@ -1,7 +1,7 @@
 #include <curses.h>
 #include <stddef.h>
 #include <malloc.h>
-#include "core.h"
+#include "mucurses.h"
 
 /** @file
  *