Implemented name-checking