renaming function names to follow convention