Fixed a bug with routes, renamed a few routes to follow convention