Naming and interface fixes