Some basic routing, renaming of things.