Annotate manifest.
Rename constants
Revert changes that broke stop name lookup + get popups working