[PATCH] Allow to use more type of terms in metric name