Renamed to meet PEP8 naming conventions