This provides a much clearer and more consistent codebase name for this part of the app. Fixes part of #25902.