Keep in one namespace
Coherent terminology: via -> waypoint
Fixed renaming in Makefile