Changed to first/last name instead of username