Wouldn't it be more consistent to do this in a separate PR? Otherwise the file ends up using two different function name conventions.