Ocotillo (Fouquieria splendens) is a wonderful plant of the desert - love seeing it! - though it isn't actually a cactus.
The other cactus in your garage is another Opuntia species, as is the original one you asked about. (I'll let the cactus experts take it beyond that!)