Revert route name change and add key to Route object to identify different route types