changing more names to follow PEP8 standard (not completed)