Replace Duck by Handle in more places
Replace Group by Set in more places.