Refactored interface names