large cleanup
refactor interface names