habres - attempt to rename G4ClaimDate to G3ClaimDate and G3NationalityAndResidency to G4NationalityAndResidency