diff --git a/keyboards/kprepublic/bm60poker/rev1/bm60poker.c b/keyboards/kprepublic/bm60poker/rev1/rev1.c
similarity index 99%
rename from keyboards/kprepublic/bm60poker/rev1/bm60poker.c
rename to keyboards/kprepublic/bm60poker/rev1/rev1.c
index a7a335209754..4029a5466c1f 100644
--- a/keyboards/kprepublic/bm60poker/rev1/bm60poker.c
+++ b/keyboards/kprepublic/bm60poker/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "bm60poker.h"
+#include "rev1.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm60poker/rev1/bm60poker.h b/keyboards/kprepublic/bm60poker/rev1/rev1.h
similarity index 100%
rename from keyboards/kprepublic/bm60poker/rev1/bm60poker.h
rename to keyboards/kprepublic/bm60poker/rev1/rev1.h
diff --git a/keyboards/kprepublic/bm60rgb/rev1/bm60rgb.c b/keyboards/kprepublic/bm60rgb/rev1/rev1.c
similarity index 99%
rename from keyboards/kprepublic/bm60rgb/rev1/bm60rgb.c
rename to keyboards/kprepublic/bm60rgb/rev1/rev1.c
index 1b4840934fb5..352118c1b1ea 100644
--- a/keyboards/kprepublic/bm60rgb/rev1/bm60rgb.c
+++ b/keyboards/kprepublic/bm60rgb/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "bm60rgb.h"
+#include "rev1.h"
 
 led_config_t g_led_config = { {
   { 0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13 },
diff --git a/keyboards/kprepublic/bm60rgb/rev1/bm60rgb.h b/keyboards/kprepublic/bm60rgb/rev1/rev1.h
similarity index 100%
rename from keyboards/kprepublic/bm60rgb/rev1/bm60rgb.h
rename to keyboards/kprepublic/bm60rgb/rev1/rev1.h
diff --git a/keyboards/kprepublic/bm60rgb_iso/rev1/bm60rgb_iso.c b/keyboards/kprepublic/bm60rgb_iso/rev1/rev1.c
similarity index 99%
rename from keyboards/kprepublic/bm60rgb_iso/rev1/bm60rgb_iso.c
rename to keyboards/kprepublic/bm60rgb_iso/rev1/rev1.c
index 4e292bc54966..f708e74c27c9 100644
--- a/keyboards/kprepublic/bm60rgb_iso/rev1/bm60rgb_iso.c
+++ b/keyboards/kprepublic/bm60rgb_iso/rev1/rev1.c
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "bm60rgb_iso.h"
+#include "rev1.h"
 
 #if defined(RGB_MATRIX_ENABLE)
 led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm60rgb_iso/rev1/bm60rgb_iso.h b/keyboards/kprepublic/bm60rgb_iso/rev1/rev1.h
similarity index 100%
rename from keyboards/kprepublic/bm60rgb_iso/rev1/bm60rgb_iso.h
rename to keyboards/kprepublic/bm60rgb_iso/rev1/rev1.h