Worked in scott's comments and got tests working again
Merge pull request #1334 from rubenvereecken/name_check_fix

Worked in scott's comments and got tests working again