Revert to old naming
Encapsulate in functions