Renaming to match the Java bindings for consitency, minor fixes