Update for library instance renaming