[FIX] Less redundant metric names
[FIX] Decouples device regex from metric name