Fixed routes to make more sense to end user.