I'll switch to that and clean up the other place where we're relying on the `Y` namespace.