diff --git a/.clang-format b/.clang-format
index a1ef22ac..5f64f593 100644
--- a/.clang-format
+++ b/.clang-format
@@ -47,7 +47,7 @@ IncludeCategories:
     Priority: 3
     CaseSensitive: true
 
-  - Regex: '(<|")homeButtonMiniLib(\/)?' # HBM headers
+  - Regex: '(<|")homebuttonMiniLib(\/)?' # HBM headers
     Priority: 4
     CaseSensitive: true
 
diff --git a/include/homeButtonMiniLib.h b/include/homeButtonMiniLib.h
deleted file mode 100644
index e4369f80..00000000
--- a/include/homeButtonMiniLib.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef HOME_BUTTON_MINI_LIB_H
-#define HOME_BUTTON_MINI_LIB_H
-
-#include <homeButtonMiniLib/HBMAnmController.h>
-#include <homeButtonMiniLib/HBMApi.h>
-#include <homeButtonMiniLib/HBMBase.h>
-#include <homeButtonMiniLib/HBMController.h>
-#include <homeButtonMiniLib/HBMFrameController.h>
-#include <homeButtonMiniLib/HBMGUIManager.h>
-#include <homeButtonMiniLib/HBMRemoteSpk.h>
-#include <homeButtonMiniLib/HBMTypes.h>
-
-
-#endif
diff --git a/include/homebuttonMiniLib.h b/include/homebuttonMiniLib.h
new file mode 100644
index 00000000..46698e7e
--- /dev/null
+++ b/include/homebuttonMiniLib.h
@@ -0,0 +1,13 @@
+#ifndef HOME_BUTTON_MINI_LIB_H
+#define HOME_BUTTON_MINI_LIB_H
+
+#include <homebuttonMiniLib/HBMAnmController.h>
+#include <homebuttonMiniLib/HBMApi.h>
+#include <homebuttonMiniLib/HBMBase.h>
+#include <homebuttonMiniLib/HBMController.h>
+#include <homebuttonMiniLib/HBMFrameController.h>
+#include <homebuttonMiniLib/HBMGUIManager.h>
+#include <homebuttonMiniLib/HBMRemoteSpk.h>
+#include <homebuttonMiniLib/HBMTypes.h>
+
+#endif
diff --git a/include/homeButtonMiniLib/HBMAnmController.h b/include/homebuttonMiniLib/HBMAnmController.h
similarity index 83%
rename from include/homeButtonMiniLib/HBMAnmController.h
rename to include/homebuttonMiniLib/HBMAnmController.h
index 84decd2a..d975009a 100644
--- a/include/homeButtonMiniLib/HBMAnmController.h
+++ b/include/homebuttonMiniLib/HBMAnmController.h
@@ -1,7 +1,7 @@
 #ifndef HOME_BUTTON_MINI_LIB_ANM_CONTROLLER_H
 #define HOME_BUTTON_MINI_LIB_ANM_CONTROLLER_H
-#include <homeButtonMiniLib/HBMFrameController.h>
-#include <homeButtonMiniLib/HBMTypes.h>
+#include <homebuttonMiniLib/HBMFrameController.h>
+#include <homebuttonMiniLib/HBMTypes.h>
 
 #include <nw4r/lyt.h>
 
diff --git a/include/homeButtonMiniLib/HBMApi.h b/include/homebuttonMiniLib/HBMApi.h
similarity index 90%
rename from include/homeButtonMiniLib/HBMApi.h
rename to include/homebuttonMiniLib/HBMApi.h
index 7feb1f7d..505c7827 100644
--- a/include/homeButtonMiniLib/HBMApi.h
+++ b/include/homebuttonMiniLib/HBMApi.h
@@ -4,7 +4,7 @@
 extern "C" {
 #endif
 
-#include <homeButtonMiniLib/HBMTypes.h>
+#include <homebuttonMiniLib/HBMTypes.h>
 
 void HBMCreate(const HBMDataInfo* pHBInfo);
 void HBMInit();
diff --git a/include/homeButtonMiniLib/HBMBase.h b/include/homebuttonMiniLib/HBMBase.h
similarity index 98%
rename from include/homeButtonMiniLib/HBMBase.h
rename to include/homebuttonMiniLib/HBMBase.h
index fe9c0cea..7b3fca35 100644
--- a/include/homeButtonMiniLib/HBMBase.h
+++ b/include/homebuttonMiniLib/HBMBase.h
@@ -1,8 +1,8 @@
 #ifndef HOME_BUTTON_MINI_LIB_BASE_H
 #define HOME_BUTTON_MINI_LIB_BASE_H
-#include <homeButtonMiniLib/HBMGUIManager.h>
-#include <homeButtonMiniLib/HBMRes.h>
-#include <homeButtonMiniLib/HBMTypes.h>
+#include <homebuttonMiniLib/HBMGUIManager.h>
+#include <homebuttonMiniLib/HBMRes.h>
+#include <homebuttonMiniLib/HBMTypes.h>
 
 #include <nw4r/lyt.h>
 #include <nw4r/snd.h>
diff --git a/include/homeButtonMiniLib/HBMController.h b/include/homebuttonMiniLib/HBMController.h
similarity index 98%
rename from include/homeButtonMiniLib/HBMController.h
rename to include/homebuttonMiniLib/HBMController.h
index ff32b067..ef4dc264 100644
--- a/include/homeButtonMiniLib/HBMController.h
+++ b/include/homebuttonMiniLib/HBMController.h
@@ -1,6 +1,6 @@
 #ifndef HOME_BUTTON_MINI_LIB_CONTROLLER_H
 #define HOME_BUTTON_MINI_LIB_CONTROLLER_H
-#include <homeButtonMiniLib/HBMTypes.h>
+#include <homebuttonMiniLib/HBMTypes.h>
 
 #include <nw4r/snd.h>
 
diff --git a/include/homeButtonMiniLib/HBMFrameController.h b/include/homebuttonMiniLib/HBMFrameController.h
similarity index 97%
rename from include/homeButtonMiniLib/HBMFrameController.h
rename to include/homebuttonMiniLib/HBMFrameController.h
index b8d5f8a3..59c6849b 100644
--- a/include/homeButtonMiniLib/HBMFrameController.h
+++ b/include/homebuttonMiniLib/HBMFrameController.h
@@ -1,6 +1,6 @@
 #ifndef HOME_BUTTON_MINI_LIB_FRAME_CONTROLLER_H
 #define HOME_BUTTON_MINI_LIB_FRAME_CONTROLLER_H
-#include <homeButtonMiniLib/HBMTypes.h>
+#include <homebuttonMiniLib/HBMTypes.h>
 
 namespace homebutton {
 
diff --git a/include/homeButtonMiniLib/HBMGUIManager.h b/include/homebuttonMiniLib/HBMGUIManager.h
similarity index 99%
rename from include/homeButtonMiniLib/HBMGUIManager.h
rename to include/homebuttonMiniLib/HBMGUIManager.h
index b214a82a..0fbc5279 100644
--- a/include/homeButtonMiniLib/HBMGUIManager.h
+++ b/include/homebuttonMiniLib/HBMGUIManager.h
@@ -1,6 +1,6 @@
 #ifndef HOME_BUTTON_MINI_LIB_GUI_MANAGER_H
 #define HOME_BUTTON_MINI_LIB_GUI_MANAGER_H
-#include <homeButtonMiniLib/HBMTypes.h>
+#include <homebuttonMiniLib/HBMTypes.h>
 
 #include <nw4r/lyt.h>
 #include <nw4r/snd.h>
diff --git a/include/homeButtonMiniLib/HBMRemoteSpk.h b/include/homebuttonMiniLib/HBMRemoteSpk.h
similarity index 97%
rename from include/homeButtonMiniLib/HBMRemoteSpk.h
rename to include/homebuttonMiniLib/HBMRemoteSpk.h
index 5aa6e24e..549ee398 100644
--- a/include/homeButtonMiniLib/HBMRemoteSpk.h
+++ b/include/homebuttonMiniLib/HBMRemoteSpk.h
@@ -1,6 +1,6 @@
 #ifndef HOME_BUTTON_MINI_LIB_REMOTE_SPK_H
 #define HOME_BUTTON_MINI_LIB_REMOTE_SPK_H
-#include <homeButtonMiniLib/HBMTypes.h>
+#include <homebuttonMiniLib/HBMTypes.h>
 
 #include <revolution/ARC.h>
 #include <revolution/OS.h>
diff --git a/include/homeButtonMiniLib/HBMRes.h b/include/homebuttonMiniLib/HBMRes.h
similarity index 99%
rename from include/homeButtonMiniLib/HBMRes.h
rename to include/homebuttonMiniLib/HBMRes.h
index 1e4c9ad6..837f37ec 100644
--- a/include/homeButtonMiniLib/HBMRes.h
+++ b/include/homebuttonMiniLib/HBMRes.h
@@ -1,7 +1,7 @@
 #ifndef HOME_BUTTON_MINI_LIB_RES_H
 #define HOME_BUTTON_MINI_LIB_RES_H
 
-#include <homeButtonMiniLib/HBMTypes.h>
+#include <homebuttonMiniLib/HBMTypes.h>
 
 namespace homebutton {
 namespace res {
diff --git a/include/homeButtonMiniLib/HBMTypes.h b/include/homebuttonMiniLib/HBMTypes.h
similarity index 100%
rename from include/homeButtonMiniLib/HBMTypes.h
rename to include/homebuttonMiniLib/HBMTypes.h
diff --git a/src/homeButtonMiniLib/HBMAnmController.cpp b/src/homebuttonMiniLib/HBMAnmController.cpp
similarity index 95%
rename from src/homeButtonMiniLib/HBMAnmController.cpp
rename to src/homebuttonMiniLib/HBMAnmController.cpp
index 013d71c2..848a81f4 100644
--- a/src/homeButtonMiniLib/HBMAnmController.cpp
+++ b/src/homebuttonMiniLib/HBMAnmController.cpp
@@ -1,9 +1,8 @@
-#include <homeButtonMiniLib.h>
+#include <homebuttonMiniLib.h>
 
 #include <nw4r/lyt.h>
 #include <nw4r/ut.h>
 
-
 namespace homebutton {
 
 GroupAnmController::GroupAnmController() : mpGroup(), mpAnimGroup() {}
diff --git a/src/homeButtonMiniLib/HBMBase.cpp b/src/homebuttonMiniLib/HBMBase.cpp
similarity index 99%
rename from src/homeButtonMiniLib/HBMBase.cpp
rename to src/homebuttonMiniLib/HBMBase.cpp
index 36a6b4af..525025b8 100644
--- a/src/homeButtonMiniLib/HBMBase.cpp
+++ b/src/homebuttonMiniLib/HBMBase.cpp
@@ -1,5 +1,5 @@
-#include <homeButtonMiniLib.h>
-#include <homeButtonMiniLib/HBMRes.h>
+#include <homebuttonMiniLib.h>
+#include <homebuttonMiniLib/HBMRes.h>
 
 #include <nw4r/lyt.h>
 #include <nw4r/ut.h>
diff --git a/src/homeButtonMiniLib/HBMController.cpp b/src/homebuttonMiniLib/HBMController.cpp
similarity index 99%
rename from src/homeButtonMiniLib/HBMController.cpp
rename to src/homebuttonMiniLib/HBMController.cpp
index 442eba2c..dbec9f77 100644
--- a/src/homeButtonMiniLib/HBMController.cpp
+++ b/src/homebuttonMiniLib/HBMController.cpp
@@ -1,4 +1,4 @@
-#include <homeButtonMiniLib.h>
+#include <homebuttonMiniLib.h>
 
 #include <revolution/MTX.h>
 #include <revolution/OS.h>
diff --git a/src/homeButtonMiniLib/HBMFrameController.cpp b/src/homebuttonMiniLib/HBMFrameController.cpp
similarity index 97%
rename from src/homeButtonMiniLib/HBMFrameController.cpp
rename to src/homebuttonMiniLib/HBMFrameController.cpp
index 4c706a4a..66189172 100644
--- a/src/homeButtonMiniLib/HBMFrameController.cpp
+++ b/src/homebuttonMiniLib/HBMFrameController.cpp
@@ -1,4 +1,4 @@
-#include <homeButtonMiniLib.h>
+#include <homebuttonMiniLib.h>
 
 namespace homebutton {
 
diff --git a/src/homeButtonMiniLib/HBMGUIManager.cpp b/src/homebuttonMiniLib/HBMGUIManager.cpp
similarity index 99%
rename from src/homeButtonMiniLib/HBMGUIManager.cpp
rename to src/homebuttonMiniLib/HBMGUIManager.cpp
index 6e17c4a5..f944d98d 100644
--- a/src/homeButtonMiniLib/HBMGUIManager.cpp
+++ b/src/homebuttonMiniLib/HBMGUIManager.cpp
@@ -1,4 +1,4 @@
-#include <homeButtonMiniLib.h>
+#include <homebuttonMiniLib.h>
 
 #include <nw4r/lyt.h>
 #include <nw4r/snd.h>
diff --git a/src/homeButtonMiniLib/HBMRemoteSpk.cpp b/src/homebuttonMiniLib/HBMRemoteSpk.cpp
similarity index 99%
rename from src/homeButtonMiniLib/HBMRemoteSpk.cpp
rename to src/homebuttonMiniLib/HBMRemoteSpk.cpp
index 765d811b..80fa8a5e 100644
--- a/src/homeButtonMiniLib/HBMRemoteSpk.cpp
+++ b/src/homebuttonMiniLib/HBMRemoteSpk.cpp
@@ -1,4 +1,4 @@
-#include <homeButtonMiniLib.h>
+#include <homebuttonMiniLib.h>
 
 #include <nw4r/snd.h>