Renamed interfaces to use I prefix instead of Interface suffix