Changes to count field naming