Renaming a bit in the interest of clarity for what's about to come next.