Switched to new Namespace for constants