Fix embarassing name conflict in routers