add countrycode/countryCode
tweak to reCaSe and regeneration for countryCode