Personally I prefer the term mu'essel or tobamel for the treacled stuff we smoke and from my travels in the Arab world I've found the term Narghile to be the most common term for the pipe we all use. I try not to use the term hookah do to the long time association in the West with degenerates smoking "other stuff" but in the end I like way narghile sounds so I use that instead.
I've had great success making my own mu'essel but the time it takes means that it is something I can't do too often. If you read the stuff I posted you'll find a proven method for making great stuff. The links I posted really have great sources for flavourings although Lorann is an excellent source as well and well worth the costs because it's so concentrated.