What is a person from Scotland called?

As a person of Scottish descent, I prefer to be called a Scot, or a Scotsman but never Scotch. Scotch is now mainly used to describe food and drink - Scotch Whisky (Scotch for short in some countries), Scotch broth etc. It was originally an English shortening of the Word Scottish and used by the Scots themselves as well as the English in the 18th century including Robert Burns and later Sir Walter Scott before reverting to the older titles in the 19th century of Scots or Scottish.