Conversion of aviary submission impl to support unique name/owner key sets