Yes, the words are often used interchangeably, and it's usually possible to tell what the meaning is from the context. But you're right: for the purposes of a discussion like this, "theism" would be more accurate than "religion".