add names and proper quotes