Change function naming to be consistent with python coding standards