Some of these metrics decorator were unlabeled without a class which would result in semi-confusing structures for the metrics counters. Now, we should be semi-consistent. Change-Id: Ie2795419991dc941f2a2b2bc0c6116b92d285041