NXP-11158: fix and rename tomcat metrics