Renaming interfaces for better consistency.