Standard for surface level prefix/suffix?

I think we've discussed this before, but I didn't find an official issue. Apologies if I missed it.

I believe the ESM standard is to use the suffix `_at_surface` for surface variables, which departs from CF naming, which often uses a `surface_` prefix. But some ESM names still seem to carry the CF name. For example, `air_pressure_at_surface` is listed right above `surface_pressure_of_dry_air`:
https://github.com/ESCOMP/ESMStandardNames/blob/71d9a92b3c19e39930a803de99334e81558378fc/Metadata-standard-names.md?plain=1#L114-L116

Is the plan to do a "bug smash' sometime to bring ESM into consistency on this? Is there a timeline for this effort? Or is this likely to be the case for a while? For new names being added, the plan is to enforce the `_at_surface` suffix?

Thanks.