Fixed issue with naming conventions

Just mass renamed some counters