Renaming things to make more sense; cleaning up the routing slip