diff --git a/mhl/README b/mhl/README
index 83fb3d7a4..90504dd38 100644
--- a/mhl/README
+++ b/mhl/README
@@ -10,7 +10,7 @@ This is a tiny library of helper functions/macros.
 
 --
 
-memory.h:	Memory management functions
+mhlmemory.h:	Memory management functions
 
     * mhl_mem_alloc_u(sz)				[MACRO-FUNC]
     
@@ -34,7 +34,7 @@ memory.h:	Memory management functions
 	like mhl_mem_free(), but with ptr as a variable that gets cleared
 	(use this as shortcut to "mhl_mem_free(foo); foo = NULL")
 
-string.h:	String helpers
+mhlstring.h:	String helpers
 
     * mhl_str_dup(const char*s) -> char*
 
@@ -75,7 +75,7 @@ string.h:	String helpers
 	[INLINE-FUNC] Reverses the string in passed buffer and returns the buffer ptr itself.
 	If NULL is passed, returns NULL.
 
-shell_escape.h:	Shell-style string escaping
+mhlescape.h:	Shell-style string escaping
 
     * mhl_shell_escape_toesc(char c) 	-> bool
 
@@ -95,7 +95,7 @@ shell_escape.h:	Shell-style string escaping
 	[INLINE-FUNC] unescapes the string into given buffer (changes buffer!) and 
 	returns ptr to the buffer itself. When NULL passed returns NULL.
 
-env.h:	Environment variable helpers
+mhlenv.h:	Environment variable helpers
 
     * mhl_getenv_dup(const char* n)	-> char*
     
diff --git a/mhl/env.h b/mhl/mhlenv.h
similarity index 100%
rename from mhl/env.h
rename to mhl/mhlenv.h
diff --git a/mhl/shell_escape.h b/mhl/mhlescape.h
similarity index 100%
rename from mhl/shell_escape.h
rename to mhl/mhlescape.h
diff --git a/mhl/memory.h b/mhl/mhlmemory.h
similarity index 100%
rename from mhl/memory.h
rename to mhl/mhlmemory.h
diff --git a/mhl/strhash.h b/mhl/mhlstrhash.h
similarity index 96%
rename from mhl/strhash.h
rename to mhl/mhlstrhash.h
index 76c14e8b9..3194c1474 100644
--- a/mhl/strhash.h
+++ b/mhl/mhlstrhash.h
@@ -2,7 +2,7 @@
 #define __MHL_STRHASH_H
 
 #include <hash.h>
-#include "../mhl/memory.h"
+#include "../mhl/mhlmemory.h"
 
 static void __mhl_strhash_free_key(void* ptr)
 {
diff --git a/mhl/string.h b/mhl/mhlstring.h
similarity index 98%
rename from mhl/string.h
rename to mhl/mhlstring.h
index fa99a7b92..905f68644 100644
--- a/mhl/string.h
+++ b/mhl/mhlstring.h
@@ -3,7 +3,7 @@
 
 #include <ctype.h>
 #include <stdarg.h>
-#include "../mhl/memory.h"
+#include "../mhl/mhlmemory.h"
 
 #define	mhl_str_dup(str)	((str ? strdup(str) : strdup("")))
 #define mhl_str_ndup(str,len)	((str ? strndup(str,len) : strdup("")))