Refactor IDicitionaryPair to IDictionaryPair