Renamed everything to legal python names