Refactoring: Renamed base interfaces.