diff --git a/keyboards/mechmini/config.h b/keyboards/mechmini/config.h
index b5c696f3f8..ecd50ca296 100644
--- a/keyboards/mechmini/config.h
+++ b/keyboards/mechmini/config.h
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // TODO: share these strings with usbconfig.h
 // Edit usbconfig.h to change these.
 #define MANUFACTURER    winkeyless.kr
-#define PRODUCT         ps2avrGB
+#define PRODUCT         mechmini
 
 /* matrix size */
 #define MATRIX_ROWS 8
diff --git a/keyboards/mechmini/keymaps/default/keymap.c b/keyboards/mechmini/keymaps/default/keymap.c
index 4b3ed916c7..786132f7b1 100644
--- a/keyboards/mechmini/keymaps/default/keymap.c
+++ b/keyboards/mechmini/keymaps/default/keymap.c
@@ -13,10 +13,10 @@ 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 "ps2avrGB.h"
+#include "mechmini.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    MECHMINI_KEYMAP(
+    KEYMAP(
         TAB,  Q,    W,    E,    R,    T,    Y,    U,   I,    O,    P,    BSLS,
         LCTL, A,    S,    D,    F,    G,    H,    J,   K,    L,    SCLN,
         LSFT, Z,    X,    C,    V,    B,    N,    M,   COMM, DOT,  SLSH,
diff --git a/keyboards/mechmini/rules.mk b/keyboards/mechmini/rules.mk
index e2b5922ea2..26dfe36d0a 100644
--- a/keyboards/mechmini/rules.mk
+++ b/keyboards/mechmini/rules.mk
@@ -40,4 +40,4 @@ CUSTOM_MATRIX = yes
 SRC = matrix.c
 
 # programming options
-PROGRAM_CMD = ./keyboards/ps2avrGB/program $(TARGET).hex
+PROGRAM_CMD = ./keyboards/mechmini/program $(TARGET).hex