switched name to last/first