Fixed naming conventions in accordance to PEP8