Add named routes; Update references