Implement orphu's suggestions to namegenerator

Issue #104