Name field now accepts underscores.  Also it appears that the switch to tabs was not actually included in my last commit, so ignore that message because it's actually here in this commit.