Tweak route registration to match new scheme