Tidy names and interfaces