Add current and proposed routes + partial fix to route name mismatches