Better naming of variables in report.py and client charting template