Renamed functions according to R usage guidelines