Shifted friendly naming to those objects devs would typically work with.