ref #5448 Enhance name checking