Refactor named routes
Merge pull request #179 from KeepSafe/named_routes

Refactor named routes