SPARK-900 Use coarser grained naming for metrics