some remaining renaming to condor