5 files changed, 8 insertions, 8 deletions
diff --git a/keyboard/jd45/Makefile b/keyboard/jd45/Makefile
index 076dced829..f6a8d10c58 100644
--- a/keyboard/jd45/Makefile
+++ b/keyboard/jd45/Makefile
@@ -54,9 +54,9 @@ SRC = jd45.c \
 	backlight.c 
 
 ifdef KEYMAP
-    SRC := keymaps/keymap_$(KEYMAP).c $(SRC)
+    SRC := keymaps/keymaps/(KEYMAP).c $(SRC)
 else
-    SRC := keymaps/keymap_default.c $(SRC)
+    SRC := keymaps/keymaps/default.c $(SRC)
 endif
 
 CONFIG_H = config.h
diff --git a/keyboard/jd45/jd45.c b/keyboard/jd45/jd45.c
index d05714f07b..bc3fcd3ddf 100644
--- a/keyboard/jd45/jd45.c
+++ b/keyboard/jd45/jd45.c
@@ -1,16 +1,16 @@
 #include "jd45.h"
 
 __attribute__ ((weak))
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
 
 };
 
 __attribute__ ((weak))
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
 
 };
 
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
 	#ifdef BACKLIGHT_ENABLE
     	backlight_init_ports();
 	#endif
@@ -20,7 +20,7 @@ void * matrix_init_kb(void) {
 	}
 };
 
-void * matrix_scan_kb(void) {
+void matrix_scan_kb(void) {
 	if (matrix_scan_user) {
 		(*matrix_scan_user)();
 	}
diff --git a/keyboard/jd45/jd45.h b/keyboard/jd45/jd45.h
index f07bd5e139..d0ca1a88d0 100644
--- a/keyboard/jd45/jd45.h
+++ b/keyboard/jd45/jd45.h
@@ -6,7 +6,7 @@
 #include "backlight.h"
 #include <stddef.h>
 
-void * matrix_init_user(void);
-void * matrix_scan_user(void);
+void matrix_init_user(void);
+void matrix_scan_user(void);
 
 #endif
diff --git a/keyboard/jd45/keymaps/keymap_default.c b/keyboard/jd45/keymaps/default.c
index 05dd46e792..05dd46e792 100644
--- a/keyboard/jd45/keymaps/keymap_default.c
+++ b/keyboard/jd45/keymaps/default.c
diff --git a/keyboard/jd45/keymaps/keymap_justin.c b/keyboard/jd45/keymaps/justin.c
index f261b54633..f261b54633 100644
--- a/keyboard/jd45/keymaps/keymap_justin.c
+++ b/keyboard/jd45/keymaps/justin.c