I'd say don't worry about adding a fixme for names, there are a lot of waterways with no name and it's easily flagged as such by computer anyway, just need to do a query on all waterways without a name tag ...