Issue 979 name validation

Closes #979