Constant name changes and more