Rename to reflect current library name
Sync with upstream