Turbostat: reorganise metric names