Reworked how names are validated