Merge "Change library name"