Let's please just revert all these ioctl renames now, and go back to the drawing board, rather than continue to dig ourselves into a deeper hole with unnecessary incremental cosmetic changes that are breaking all the builds.
I generally agree that calling something plain `old' is bad and the proliferation of them into sanitizers is also bad, but flailing around with broken builds and without a clear plan for how this should fit together and be maintained is much worse.