Update for renaming of library stuff