adapt new names and api