Significant variable naming changes and unit test code additions on the metric side

Significant variable naming changes and unit test code additions on the metric side #2839