Minor renaming; trying to clarify the role of stuff w/in the map of maps / cache.