Small renaming
Bunch of object-ey changes