Yes. A whale is a term for a user that has a lot of Steem Power. A witness is someone who is running software to power the blockchain. Some witnesses are whales, but not all of them are.