Used new counters rather than old ones anywhere we can be backward compatible

Remains the cases where we have to change the counter's names. These were untouched for now

Edited by Sebastien Ponce

Merge request reports

Loading