Fix mixup between enforcing and enforced but allow either one to be used by end-user