Removed unsafe name checks