change interfaces to match the common C++ style