Deprecate shims, rename enum to lessen clashing