diff --git a/config/base.keymap b/config/base.keymap
index 77d6437..5aec1dd 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -19,8 +19,8 @@
 #define PASTE LC(V)
 #define UNDO LC(Z)
 #define SLALL LC(A)
-#define FHOME LC(HOME)
-#define FEND LC(END)
+#define FIRST LC(HOME)
+#define LAST LC(END)
 
 /* Key Position Groups */
 #define KEYS_L 0 1 2 3 4 10 11 12 13 14 20 21 22  // left-hand keys
@@ -127,8 +127,8 @@
         nav_layer {
             label = "Nav";
             bindings = <
-                &kp F1    &kp F2    &kp F3    &kp F4    &kp F5      &kp FHOME &kp ESC   &kp UARW  &kp TAB   &home
-                &kp LGUI  &kp LALT  &kp LSHFT &kp LCTRL &kp UNDO    &kp FEND  &kp LARW  &kp ENTER &kp RARW  &end
+                &kp F1    &kp F2    &kp F3    &kp F4    &kp F5      &kp FIRST &kp ESC   &kp UARW  &kp TAB   &home
+                &kp LGUI  &kp LALT  &kp LSHFT &kp LCTRL &kp UNDO    &kp LAST  &kp LARW  &kp ENTER &kp RARW  &end
                           &kp CUT   &kp COPY  &kp PASTE                       &kp BSPC  &kp DARW  &kp DEL
                                               &trans    &trans      &trans    &trans
             >;