Fix more brokenness with GNT_DISABLE_DEPRECATED.

Public names may be hidden, but we may still need something to use
later, even if the later field is hidden. Use the private name instead
for these hidden fields.