Whiskey is the general term, but Canadian and Scotch whisky.
Plurals:
whiskey, whiskeys
whisky, whiskies