Adding 'Listener' suffix to navigation builder listeners
Updating service definitions for navigation builder listeners following their renaming