More refactoring, improve the way metrics are consume. Remove dependency on internal naming of metrics.

Signed-off-by: nscavell <nick.scavelli@gmail.com>