Should we maybe look for comments like this which still refer to `suffix`, which is now `name` for metrics?