Charles Rennie McIntosh or Mackintosh?