Yep, these are the terms I've always used when whitewater rafting.