Rename venturi_usa to venturi for a more conventional naming scheme.