Naming Refactore (Breaking Changes due to Interface Renaming