Refactoring and renaming of IRI resolution class