Renamed functions (in prep for project renaming)