More renaming in order to approach PEP8