diff --git a/jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java b/jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java
index 4817aee67ced24788df3c1b2effa5fe6978daa1b..592d34ff18665fcdf6a70e43779b7691247c3795 100644
--- a/jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java
+++ b/jadx-core/src/main/java/jadx/core/codegen/CodeWriter.java
@@ -119,13 +119,6 @@ public class CodeWriter {
 		buf.append(code.buf);
 		return this;
 	}
-	
-	public void updateContent(String newData) {
-		offset = newData.length();
-		buf = new StringBuilder(newData);
-		line = newData.split(NL).length + 1;
-		code = newData;
-	}
 
 	public CodeWriter newLine() {
 		addLine();
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
index 79f54697fe27a0c02efc8b4125bdd6dc99ac7b42..244161c9b38570dd4fb19f419775a307e0b899cd 100644
--- a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
+++ b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
@@ -251,8 +251,8 @@ public class BinaryXMLParser extends CommonBinaryParser {
 		}
 		isOneLine = true;
 		isLastEnd = false;
-		currentTag = getValidTagAttributeName(getString(startNSName));
-		currentTag = deobfClassName(currentTag);
+		currentTag = deobfClassName(getString(startNSName));
+		currentTag = getValidTagAttributeName(currentTag);
 		writer.startLine("<").add(currentTag);
 		writer.attachSourceLine(elementBegLineNumber);
 		int attributeStart = is.readInt16();
@@ -441,7 +441,8 @@ public class BinaryXMLParser extends CommonBinaryParser {
 		int comment = is.readInt32();
 		int elementNS = is.readInt32();
 		int elementNameId = is.readInt32();
-		String elemName = getValidTagAttributeName(getString(elementNameId));
+		String elemName = deobfClassName(getString(elementNameId));
+		elemName = getValidTagAttributeName(elemName);
 		if (currentTag.equals(elemName) && isOneLine && !isLastEnd) {
 			writer.add("/>");
 		} else {