minor changes to id/name