I constantly get confused between 三摩地 (I assume the English term is Samadhi) and 奢摩他 (and similarly, the English term should be Samatha?).
I like how a person on another forum provided a simpler way to remember it:
Paring it down to a few words. Samadhi is concentration and Samatha is a practice.
My question then is this accurate?