Modified Service Gateway routes to be more consistent