Standardize names
Merge pull request #833 from caskdata/feature/r2.6.0_fix_test_reporting

Standardize names