diff --git a/core/mux/common/config/dictionary.xml b/core/mux/common/config/dictionary.xml
index 26c3d6438..6f7c02bc2 100644
--- a/core/mux/common/config/dictionary.xml
+++ b/core/mux/common/config/dictionary.xml
@@ -2980,7 +2980,7 @@
   </avpdefn>
 
   <avpdefn name="Location-Estimate" code="1242" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
-    <type type-name="UTF8String" />
+    <type type-name="OctetString" />
   </avpdefn>
 
   <avpdefn name="Positioning-Data" code="1245" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
diff --git a/examples/charging-server-simulator/src/main/resources/dictionary.xml b/examples/charging-server-simulator/src/main/resources/dictionary.xml
index 26c3d6438..6f7c02bc2 100644
--- a/examples/charging-server-simulator/src/main/resources/dictionary.xml
+++ b/examples/charging-server-simulator/src/main/resources/dictionary.xml
@@ -2980,7 +2980,7 @@
   </avpdefn>
 
   <avpdefn name="Location-Estimate" code="1242" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
-    <type type-name="UTF8String" />
+    <type type-name="OctetString" />
   </avpdefn>
 
   <avpdefn name="Positioning-Data" code="1245" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
diff --git a/examples/guide1/src/main/resources/org/example/client/dictionary.xml b/examples/guide1/src/main/resources/org/example/client/dictionary.xml
index 26c3d6438..6f7c02bc2 100644
--- a/examples/guide1/src/main/resources/org/example/client/dictionary.xml
+++ b/examples/guide1/src/main/resources/org/example/client/dictionary.xml
@@ -2980,7 +2980,7 @@
   </avpdefn>
 
   <avpdefn name="Location-Estimate" code="1242" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
-    <type type-name="UTF8String" />
+    <type type-name="OctetString" />
   </avpdefn>
 
   <avpdefn name="Positioning-Data" code="1245" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
diff --git a/examples/guide1/src/main/resources/org/example/server/dictionary.xml b/examples/guide1/src/main/resources/org/example/server/dictionary.xml
index 26c3d6438..6f7c02bc2 100644
--- a/examples/guide1/src/main/resources/org/example/server/dictionary.xml
+++ b/examples/guide1/src/main/resources/org/example/server/dictionary.xml
@@ -2980,7 +2980,7 @@
   </avpdefn>
 
   <avpdefn name="Location-Estimate" code="1242" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
-    <type type-name="UTF8String" />
+    <type type-name="OctetString" />
   </avpdefn>
 
   <avpdefn name="Positioning-Data" code="1245" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
diff --git a/testsuite/load/core/src/main/resources/dictionary.xml b/testsuite/load/core/src/main/resources/dictionary.xml
index 26c3d6438..6f7c02bc2 100644
--- a/testsuite/load/core/src/main/resources/dictionary.xml
+++ b/testsuite/load/core/src/main/resources/dictionary.xml
@@ -2980,7 +2980,7 @@
   </avpdefn>
 
   <avpdefn name="Location-Estimate" code="1242" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
-    <type type-name="UTF8String" />
+    <type type-name="OctetString" />
   </avpdefn>
 
   <avpdefn name="Positioning-Data" code="1245" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
diff --git a/testsuite/test-framework/src/test/resources/dictionary.xml b/testsuite/test-framework/src/test/resources/dictionary.xml
index 26c3d6438..6f7c02bc2 100644
--- a/testsuite/test-framework/src/test/resources/dictionary.xml
+++ b/testsuite/test-framework/src/test/resources/dictionary.xml
@@ -2980,7 +2980,7 @@
   </avpdefn>
 
   <avpdefn name="Location-Estimate" code="1242" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
-    <type type-name="UTF8String" />
+    <type type-name="OctetString" />
   </avpdefn>
 
   <avpdefn name="Positioning-Data" code="1245" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
diff --git a/testsuite/tests/src/test/resources/dictionary.xml b/testsuite/tests/src/test/resources/dictionary.xml
index 26c3d6438..6f7c02bc2 100644
--- a/testsuite/tests/src/test/resources/dictionary.xml
+++ b/testsuite/tests/src/test/resources/dictionary.xml
@@ -2980,7 +2980,7 @@
   </avpdefn>
 
   <avpdefn name="Location-Estimate" code="1242" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
-    <type type-name="UTF8String" />
+    <type type-name="OctetString" />
   </avpdefn>
 
   <avpdefn name="Positioning-Data" code="1245" vendor-id="TGPP" mandatory="must" protected="may" may-encrypt="no" vendor-bit="must" >
diff --git a/testsuite/tests/src/test/resources/validator.xml b/testsuite/tests/src/test/resources/validator.xml
index 1cf21c6b6..33f1ad3c6 100644
--- a/testsuite/tests/src/test/resources/validator.xml
+++ b/testsuite/tests/src/test/resources/validator.xml
@@ -2835,7 +2835,7 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
       <enum name="LAWFUL_INTERCEPT_SERVICES" code="3" />
     </avp>
     <avp name="Location-Estimate" code="1242" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="UTF8String" />
+      <type type-name="OctetString" />
     </avp>
     <avp name="Location-Estimate-Type" code="1243" mandatory="may" vendor-bit="must" vendor-id="TGPP">
       <type type-name="Enumerated" />
diff --git a/testsuite/tests/src/test/resources/validatorOff.xml b/testsuite/tests/src/test/resources/validatorOff.xml
index 5178d7471..1dffc0f4c 100644
--- a/testsuite/tests/src/test/resources/validatorOff.xml
+++ b/testsuite/tests/src/test/resources/validatorOff.xml
@@ -2835,7 +2835,7 @@ Note: The AVP codes from 1119 to 1199 are reserved for TS 29.140
       <enum name="LAWFUL_INTERCEPT_SERVICES" code="3" />
     </avp>
     <avp name="Location-Estimate" code="1242" mandatory="must" may-encrypt="yes" protected="may" vendor-bit="must" vendor-id="TGPP">
-      <type type-name="UTF8String" />
+      <type type-name="OctetString" />
     </avp>
     <avp name="Location-Estimate-Type" code="1243" mandatory="may" vendor-bit="must" vendor-id="TGPP">
       <type type-name="Enumerated" />