Revert "Metric names."

This reverts commit bab731667786d62636676b3b21b714a587455f76.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

Author: bboreham

pkg/test/runner.go

@@ -28,15 +28,15 @@ var (
 	testcaseResult = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
 			Subsystem: subsystem,
-			Name:      "testcase_results_total",
+			Name:      "test_case_result_total",
 			Help:      "Number of test cases that succeed / fail.",
 		},
 		[]string{"result"},
 	)
 	sampleResult = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
 			Subsystem: subsystem,
-			Name:      "sample_results_total",
+			Name:      "sample_result_total",
 			Help:      "Number of samples that succeed / fail.",
 		},
 		[]string{"result"},