would it make sense to rename them, e.g: [P.S. I see no big need to include this rename and this pull into current release cut]
cms_maps -> cms_maps_prod
maps -> cms_maps_preprod
public_maps (create new one)