diff --git a/json/tr181.json b/json/tr181.json
index 00033dfe..bba64d71 100644
--- a/json/tr181.json
+++ b/json/tr181.json
@@ -736,27 +736,6 @@
 					}
 				]
 			},
-			"X_IOPSYS_EU_BaseMACAddress": {
-				"type": "string",
-				"read": true,
-				"write": false,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "string",
-				"mapping": [
-					{
-						"type": "ubus",
-						"ubus": {
-							"object": "router.system",
-							"method": "info",
-							"args": {},
-							"key": "basemac"
-						}
-					}
-				]
-			},
 			"Device.DeviceInfo.VendorConfigFile.{i}.": {
 				"type": "object",
 				"protocols": [
@@ -6558,41 +6537,6 @@
 						}
 					}
 				]
-			},
-			"X_IOPSYS_EU_LocalTimeZoneName": {
-				"type": "string",
-				"read": true,
-				"write": false,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "string",
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "system",
-							"section": {
-								"type": "system",
-								"name": "@system[0]"
-							},
-							"option": {
-								"name": "zonename"
-							}
-						}
-					}
-				]
-			},
-			"X_IOPSYS_EU_SourceInterface": {
-				"type": "string",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "string"
 			}
 		},
 		"Device.UserInterface.": {
diff --git a/tools/generate_xml.sh b/tools/generate_xml.sh
index 23f6b9fc..69e1ba80 100755
--- a/tools/generate_xml.sh
+++ b/tools/generate_xml.sh
@@ -163,8 +163,8 @@ gen_dm_tree(){
 			fi
 
 			if [ -n "$str" ]; then
-				child_objects=${f7// }
-				child_parameters=${f8// }
+				child_objects=${f8// }
+				child_parameters=${f9// }
 				obj_name=${name}
 
 				#Add the actual object to the list of objects looking for their children objects ########
diff --git a/tools/generate_xml_bbf.sh b/tools/generate_xml_bbf.sh
index 956f9ebe..35862b22 100755
--- a/tools/generate_xml_bbf.sh
+++ b/tools/generate_xml_bbf.sh
@@ -217,8 +217,8 @@ gen_dm_tree(){
 			fi
 
 			if [ -n "$str" ]; then
-				child_objects=${f7// }
-				child_parameters=${f8// }
+				child_objects=${f8// }
+				child_parameters=${f9// }
 				obj_name=${name}
 
 				#Add the actual object to the list of objects looking for their children objects ########