Rename some functions as they were confusing to differentiate between.