Update for names and others