modify name convention according to PEP8