Update NetNewsWire for new naming conventions
Merge pull request #1588 from Cottser/netnewswire

Update NetNewsWire for new naming conventions