U4-2612

Refactored name checking