Renamed interfaces to their appropriate names