Echinopsis is the new world nomenclature of the genus. Trichocereus is still used though.

Not all trichocereus species contain mescaline. It's mainly contained within 3 species: bridgesii, peruvianus, and pachanoi. The alkaloid content is pretty variable between species and it's also dependent on weather, season and how much water they get.