Further fix for library naming