cigarro vs. cigarillo
I work in a grocery store and when hispanics want to buy cigarettes, most of them ask for "cigarros." The dictionaries that I've looked at say that cigarro means cigar and that cigarillo means cigarette. When I ask the hispanics about it, they insist that cigarro means cigarette.
I guess it's a bit of a regional thing, cigarrillo and cigarro can both be cigarettes and cigarro habano is cigar as far as I know. (Also in Spain they used to call cigars 'puros' but possibly that has changed).