simplify apply-renamings, bind resolve-model-import