fixed naming of various interfaces and functions