Updated library and rename