Fixed issue with generateName not removing some improper characters