update interAdapt naming, some other minor changes