Updated function names to conform to R style-guide