TESTREPORT-6: Rename some pretty names