Added in a ton more name checks