Updated function naming to comply with pep8