GP-10 - Added NameTokens validator