diff --git a/client/location.go b/client/location.go
index ff50195..bd7333d 100644
--- a/client/location.go
+++ b/client/location.go
@@ -19,7 +19,7 @@ func GetLocation() Location {
 
 // GetLocationByCode ...
 func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*model.ResponseLocationAddress, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetLocationByCodeNew, toBytes(payload))
+	msg, err := natsio.GetServer().Request(subject.Location.GetLocationByCodeFromLocationService, toBytes(payload))
 	if err != nil {
 		return nil, err
 	}
@@ -40,7 +40,7 @@ func (l Location) GetLocationByCode(payload model.LocationRequestPayload) (*mode
 
 // GetProvincesByCodes ...
 func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.LocationProvinceResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCodesNew, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Location.GetProvincesByCodesFromLocationService, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
@@ -62,7 +62,7 @@ func (l Location) GetProvincesByCodes(p model.ProvinceRequestPayload) (*model.Lo
 
 // GetDistrictsByCodes ...
 func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.LocationDistrictResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCodesNew, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Location.GetDistrictsByCodesFromLocationService, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
@@ -84,7 +84,7 @@ func (l Location) GetDistrictsByCodes(p model.DistrictRequestPayload) (*model.Lo
 
 // GetWardsByCodes ...
 func (l Location) GetWardsByCodes(p model.WardRequestPayload) (*model.LocationWardResponse, error) {
-	msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCodesNew, toBytes(p))
+	msg, err := natsio.GetServer().Request(subject.Location.GetWardsByCodesFromLocationService, toBytes(p))
 	if err != nil {
 		return nil, err
 	}
diff --git a/subject/location.go b/subject/location.go
index 3ee9baf..df2117c 100644
--- a/subject/location.go
+++ b/subject/location.go
@@ -7,41 +7,41 @@ func getLocationValue(val string) string {
 }
 
 var Location = struct {
-	GetLocationByCode         string
-	GetLocationByCodeNew      string
-	GetProvincesByCodes       string
-	GetProvincesByCodesNew    string
-	GetDistrictsByCodes       string
-	GetDistrictsByCodesNew    string
-	GetWardsByCodes           string
-	GetWardsByCodesNew        string
-	GetProvinceByCondition    string
-	GetProvincesByCondition   string
-	GetDistrictByCondition    string
-	GetDistrictsByCondition   string
-	GetWardByCondition        string
-	GetWardsByCondition       string
-	CountProvinceByCondition  string
-	CountDistrictByCondition  string
-	CountWardByCondition      string
-	ProvinceDistinctWithField string
+	GetLocationByCode                      string
+	GetLocationByCodeFromLocationService   string
+	GetProvincesByCodes                    string
+	GetProvincesByCodesFromLocationService string
+	GetDistrictsByCodes                    string
+	GetDistrictsByCodesFromLocationService string
+	GetWardsByCodes                        string
+	GetWardsByCodesFromLocationService     string
+	GetProvinceByCondition                 string
+	GetProvincesByCondition                string
+	GetDistrictByCondition                 string
+	GetDistrictsByCondition                string
+	GetWardByCondition                     string
+	GetWardsByCondition                    string
+	CountProvinceByCondition               string
+	CountDistrictByCondition               string
+	CountWardByCondition                   string
+	ProvinceDistinctWithField              string
 }{
-	GetLocationByCode:         getLocationValue("get_location_warehouse"),
-	GetLocationByCodeNew:      getLocationValue("get_location_warehouse_new"),
-	GetProvincesByCodes:       getLocationValue("get_provinces_by_codes"),
-	GetProvincesByCodesNew:    getLocationValue("get_provinces_by_codes_new"),
-	GetDistrictsByCodes:       getLocationValue("get_districts_by_codes"),
-	GetDistrictsByCodesNew:    getLocationValue("get_districts_by_codes_new"),
-	GetWardsByCodes:           getLocationValue("get_wards_by_codes"),
-	GetWardsByCodesNew:        getLocationValue("get_wards_by_codes_new"),
-	GetProvinceByCondition:    getLocationValue("get_province_by_condition"),
-	GetProvincesByCondition:   getLocationValue("get_provinces_by_condition"),
-	GetDistrictByCondition:    getLocationValue("get_district_by_condition"),
-	GetDistrictsByCondition:   getLocationValue("get_districts_byCondition"),
-	GetWardByCondition:        getLocationValue("get_ward_by_condition"),
-	GetWardsByCondition:       getLocationValue("get_wards_by_condition"),
-	CountProvinceByCondition:  getLocationValue("count_province_by_condition"),
-	CountDistrictByCondition:  getLocationValue("count_district_by_condition"),
-	CountWardByCondition:      getLocationValue("count_ward_by_condition"),
-	ProvinceDistinctWithField: getLocationValue("province_distinct_with_field"),
+	GetLocationByCode:                      getLocationValue("get_location_warehouse"),
+	GetLocationByCodeFromLocationService:   getLocationValue("get_location_warehouse_from_location_service"),
+	GetProvincesByCodes:                    getLocationValue("get_provinces_by_codes"),
+	GetProvincesByCodesFromLocationService: getLocationValue("get_provinces_by_codes_from_location_service"),
+	GetDistrictsByCodes:                    getLocationValue("get_districts_by_codes"),
+	GetDistrictsByCodesFromLocationService: getLocationValue("get_districts_by_codes_from_location_service"),
+	GetWardsByCodes:                        getLocationValue("get_wards_by_codes"),
+	GetWardsByCodesFromLocationService:     getLocationValue("get_wards_by_codes_from_location_service"),
+	GetProvinceByCondition:                 getLocationValue("get_province_by_condition"),
+	GetProvincesByCondition:                getLocationValue("get_provinces_by_condition"),
+	GetDistrictByCondition:                 getLocationValue("get_district_by_condition"),
+	GetDistrictsByCondition:                getLocationValue("get_districts_byCondition"),
+	GetWardByCondition:                     getLocationValue("get_ward_by_condition"),
+	GetWardsByCondition:                    getLocationValue("get_wards_by_condition"),
+	CountProvinceByCondition:               getLocationValue("count_province_by_condition"),
+	CountDistrictByCondition:               getLocationValue("count_district_by_condition"),
+	CountWardByCondition:                   getLocationValue("count_ward_by_condition"),
+	ProvinceDistinctWithField:              getLocationValue("province_distinct_with_field"),
 }