Update metric definitions by refactoring names to be shorted and sort by groups