Now the cases for name and surname should be fixed