Refactor of interface names to I{name}