Fix naming convention according to PEP8 for the first time