Made perf counter changes

Don't put json in the name, it's not part of the class name it's part of the data format.