I don't see any needs for renaming. Separation of maps should be accomplished with tools modification, since we need all maps (public, e.g. google APIs as well as CMS ones) in one place since our tools dumps them together into MongoDB. Let's not rush this changes for this release.