What does the OED say? Cannabis "2. (Orig. ellipt. for Cannabis sativa or (esp.) indica.) Any of various preparations of different parts of the hemp-plant which are smoked, chewed, or drunk for their intoxicating or hallucinogenic properties and were formerly used medicinally; bhang (marijuana), ganja, and charas (hashish) are different forms of these preparations and there are many other names." Marijuana "a. (A preparation of) the plant, used as an intoxicating and hallucinogenic drug; esp. a crude preparation of the dried leaves, flowering tops, and stem of the plant in a form for smoking.The currency of the word increased greatly in the United States in the 1930s in the context of the debate over the use of the drug, the term being preferred as a more exotic alternative to the familiar words hemp and cannabis."   ·  · email) (if I write on your page reply on mine)