Renamed some interfaces