Implemented name checking