diff --git a/json/tr181.json b/json/tr181.json
index 71b2b28d..da9b5556 100644
--- a/json/tr181.json
+++ b/json/tr181.json
@@ -29790,7 +29790,7 @@
 					"list": {
 						"datatype": "string"
 					}
-				},
+				}, 
 				"Device.WiFi.Radio.{i}.Stats.": {
 					"type": "object", 
 					"protocols": [
@@ -31699,7 +31699,7 @@
 							}
 						]
 					}, 
-					"SecondaryRadiusServerIPAddr ": {
+					"SecondaryRadiusServerIPAddr": {
 						"type": "string", 
 						"read": true, 
 						"write": true, 
@@ -31822,7 +31822,7 @@
 							"cwmp"
 						], 
 						"datatype": "boolean"
-					},
+					}, 
 					"Reset()": {
 						"type": "command", 
 						"protocols": [
@@ -74311,7 +74311,7 @@
 							}
 						]
 					}, 
-					"PublishQoS ": {
+					"PublishQoS": {
 						"type": "unsignedInt", 
 						"read": true, 
 						"write": true, 
diff --git a/tools/generate_json.py b/tools/generate_json.py
index 443939f7..5a279e2d 100755
--- a/tools/generate_json.py
+++ b/tools/generate_json.py
@@ -295,9 +295,9 @@ def objhasparam (dmobject):
 def printopenobject (obj):
 	fp = open('./.json_tmp', 'a')
 	if "tr-104" in sys.argv[1]:
-		print >> fp, "\"Device.Services.%s\" : {" % obj.get('name')
+		print >> fp, "\"Device.Services.%s\" : {" % obj.get('name').replace(" ", "")
 	else:
-		print >> fp, "\"%s\" : {" % obj.get('name')
+		print >> fp, "\"%s\" : {" % obj.get('name').replace(" ", "")
 	fp.close()
 
 def printopenfile ():
@@ -463,7 +463,7 @@ def printPARAM( dmparam, dmobject, bbfdm_type ):
 	islist, datatype, paramvalrange, paramenum, paramunit, parampattern, listminItem, listmaxItem, listmaxsize = getparamoption(dmparam)
 
 	fp = open('./.json_tmp', 'a')
-	print >> fp,  "\"%s\" : {" % dmparam.get('name')
+	print >> fp,  "\"%s\" : {" % dmparam.get('name').replace(" ", "")
 	print >> fp,  "\"type\" : \"%s\"," % getparamtype(dmparam)
 	print >> fp,  "\"read\" : true,"
 	print >> fp,  "\"write\" : %s," % ("false" if dmparam.get('access') == "readOnly" else "true")