rename functions + function argument to be more consistent (part 1)