checking in the benign parts of a big refactor

in some cases it comes back as "metadata" and some cases as "meta". I was just unifying it.