Tweak to naming in #6375