Updated library import names