Put NAME in right place, fix typo