Merge fix, rename route on router