Implement more name checking.