Changes to naming conventions