Grey Havens and Valinor

[the real findorfin]

Now we know that the Grey Havens is the port on the west coast of Middle-Earth and Valinor is in Aman across the sea.

But on much of the FOTR merchandise the Grey Havens = Valinor. HAs anyone else noticed this, for instance it was on this calender pad for 2002 as one of the questions.

I would appreciate comments.