Update GrandTotal for new naming conventions
Merge pull request #1567 from Cottser/grandtotal

Update GrandTotal for new naming conventions