<Improve> Clean up one last libs => vendor name.