More function renaming. Yay!