What is the name of the people who live in Scotland?

Scottish or Scots, Scotch was used in the 18th century but is only applied to whiskey and food now (Scotch broth etc).