More vendor -> lib renaming. Need to get tidier.