-alias g_waypointeditor_spawn "impulse 103"
-alias g_waypointeditor_remove "impulse 104"
-alias g_waypointeditor_relinkall "impulse 105"
-alias g_waypointeditor_saveall "impulse 106"
-alias g_waypointeditor_unreachable "impulse 107"
+alias wpeditor_menu "quickmenu file \"\" wpeditor.txt"
+
+alias g_waypointeditor_spawn "wpeditor spawn"
+alias g_waypointeditor_remove "wpeditor remove"
+alias g_waypointeditor_relinkall "wpeditor relinkall"
+alias g_waypointeditor_saveall "wpeditor saveall"
+alias g_waypointeditor_unreachable "wpeditor unreachable"
+alias g_waypointeditor_help "wpeditor"
+alias g_waypointeditor_menu "wpeditor_menu"
+alias g_waypointeditor_spawn_x "wpeditor spawn crosshair"
+alias g_waypointeditor_spawn_jump "wpeditor spawn jump"
+alias g_waypointeditor_spawn_crouch "wpeditor spawn crouch"
+alias g_waypointeditor_spawn_support "wpeditor spawn support"
+alias g_waypointeditor_hardwire "wpeditor hardwire"
+alias g_waypointeditor_hardwire_x "wpeditor hardwire crosshair"
+alias g_waypointeditor_lock "wpeditor lock"
+alias g_waypointeditor_symorigin "wpeditor symorigin $*"
+alias g_waypointeditor_symaxis "wpeditor symaxis $*"
+
+alias navwaypoint_relink g_waypointeditor_spawn
+alias navwaypoint_remove g_waypointeditor_remove
+alias navwaypoint_save g_waypointeditor_relinkall
+alias navwaypoint_spawn g_waypointeditor_saveall
+alias navwaypoint_unreachable g_waypointeditor_unreachable