2.7.4 - updates Waypoints and prevents event namespace collisions