Refactoring to remove the I from the interface names