Proper name for NFC

This is loosely related to issue NEXUS-6287
and discussion we had with Peter
Merge remote-tracking branch 'origin/master' into realm-caches