Refactor interface names