Is all this meta renaming necessary? It makes for a difficult review, and it seems to me that we'll use the same meters, etc. to measure all the rollups, not just the basic ones.