NXP-11158 renamed metrics