Yeah, I went back and forth on that actually.

Keep in mind that this already passed one round of reviews to get into master (#2369), I just moved it.

I can rename if it really bothers you.