Refactored the route variables. More refacts to come.
Renaming to clean up things.