Making Sense of Complexity

Is it just me or do others get peeved when the words complex and complicated are used interchangeably?

To me they mean very different things:

A complicated problem is one that is difficult to understand. A complex problem is one composed of many distinct parts.

A complex problem could also be very complicated, but a complicated problem may not or may not be complex at all depending on the situation.