Add some more tests for the naming module
Refactor, avoid really long lines
#95, if a name has any digits in it, don't try and camel case it - separating numbers by underscore is reasonable