General changes in TftE

[Aiwendil]

Indeed, as Jallanite (I think) noted so long ago:

{Thorn Sir}[Thoron Sîr] This updates the two elements for the name from Gnomish to their QS77 and LR Sindarin forms, but I’m not sure the syntax of this later name is valid.

Certainly it seems that if the meaning is to be 'River of (the) Eagle' then it would have to be 'Sîr Thoron'. But it seems to me rather that 'eagle' is being used adjectivally: 'Eagle River'. But I don't know if that kind of noun-noun construction is used in later Sindarin.

On another note: Having thought about it some more, I now think it quite probable that the plot-synopsis in which 'Faramir' occurs is later than the texts that use 'Gelmir' and that Tolkien changed the name precisely to avoid the repetition of the name. Earlier I had supposed that the fact that CT used 'Gelmir' in UT suggested he thought that was the final form adopted in the Narn. However, it now occurs to me that he likely used 'Gelmir' so as to agree with the '77. So I think we're agreed on {Gelmir}[Faramir] now.