Pythonic naming convention fix