> these terms are typically used interchangeably in a more general sense

No, these terms are used interchangeably by users who don't know what they mean.

> Perhaps it would be better to come up with some different terms for these concepts.

These concepts already have different terms. We don't need to come-up with new ones; we just need to start using the existing terms correctly.