Better decorator syntax for registration of metrics
Fix metric names for compatibility