diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go b/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go
index 7b725ef5..b060435c 100644
--- a/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go
+++ b/pkg/innerring/processors/netmap/nodevalidation/locode/calls.go
@@ -20,8 +20,8 @@ var errMissingRequiredAttr = errors.New("missing required attribute in DB record
 // If DB entry R was found w/o errors, then new attributes are:
 //  * CountryCode: R.CountryCode().String();
 //  * Country: R.CountryName();
-//  * CityCode: R.LocationCode().String();
-//  * City: Record.LocationName();
+//  * LocationCode: R.LocationCode().String();
+//  * Location: Record.LocationName();
 //  * SubDivCode: R.SubDivCode();
 //  * SubDiv: R.SubDivName();
 //  * Continent: R.Continent().String().
diff --git a/pkg/innerring/processors/netmap/nodevalidation/locode/validator.go b/pkg/innerring/processors/netmap/nodevalidation/locode/validator.go
index fcd80ff5..78e352f0 100644
--- a/pkg/innerring/processors/netmap/nodevalidation/locode/validator.go
+++ b/pkg/innerring/processors/netmap/nodevalidation/locode/validator.go
@@ -33,8 +33,8 @@ const (
 	attrKeyCountryCode = "CountryCode"
 	attrKeyCountry     = "Country"
 
-	attrKeyLocationCode = "CityCode"
-	attrKeyLocation     = "City"
+	attrKeyLocationCode = "LocationCode"
+	attrKeyLocation     = "Location"
 
 	attrKeySubDivCode = "SubDivCode"
 	attrKeySubDiv     = "SubDiv"