New round of cleanup of old style counters
This time, changes are less trivial as counters had their names built at runtime.
Goes together with Rec!2204 (merged), Brunel!1068 (merged), Phys!781 (merged), Analysis!700 (merged), Castelao!82 (merged)
Done on top of !2720 (merged)