MNT: Missed some renames in the refactor