Add validation to ensure names are