Updated references (used asterisk, *)

Dropped "I" from interfaces