Merge "Adjust for library rename"