Renaming, update bindings