Better full-name generation; closes #490