Changes to naming and logic