Cleanups n renames

Several commits that were on 6011, but not directly related. Just trying to shrink the size of that PR.