make_derive was recently deprecated in favor of make_counter, so make the change throughput the codebase. Closes #10564