Updated check for first/last name