Erikb's definitions "feel" like they should be right, but yours (and Wikipedia's) are really closer to how I've seen them used by people. Constructing a difference between them sounds like something that could easily happen within a group of friends, if the distinction becomes useful to them.