First, let's analyze the words.
Aviary : a place to confine birds
Birds : The animal that is being confined in the aviary
Best on the analyzation, the best analogy would be something like :
Apiary : a place to confine bees
Bees : The animal that is being confined in the apiary
Hope this helps
