renamed a few function calls