renaming COUNT to COUNTER in MetricType and other minor changes -- code review