Refactor interface names and constants