Refactor constant deprecations