Remove "count" added at the end of indicators name