update validations, add name generator