add aviary, avoid naming collisions