Remove useless '' and add names/noma