Better namespacing of stats based on feedback from Ross