Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
===================================================================
diff -u -ra315972c7e278cf7a0584fcd5fbf7d22957cc4a6 -r8e6d3a3c0b5962efd640cfe3845c58f5d3269857
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java	(.../ToolContentVersionFilter.java)	(revision a315972c7e278cf7a0584fcd5fbf7d22957cc4a6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java	(.../ToolContentVersionFilter.java)	(revision 8e6d3a3c0b5962efd640cfe3845c58f5d3269857)
@@ -179,6 +179,11 @@
     }
 
     private void retrieveXML(Element root) throws IOException {
+	for (Entry<String, String> renamed : renamedClassMap.entrySet()) {
+	    // if root element was replaced in one of tool.xml files, it needs to be fetched here for further processing
+	    root = (Element) ToolContentVersionFilter.renameClass(root, renamed.getKey(), renamed.getValue());
+	}
+
 	for (RemovedField remove : removedFieldList) {
 	    if (StringUtils.equals(root.getNodeName(), remove.ownerClass)
 		    || StringUtils.equals(root.getAttribute("class"), remove.ownerClass)) {
@@ -219,12 +224,6 @@
 	    }
 	}
 
-	for (Entry<String, String> renamed : renamedClassMap.entrySet()) {
-	    // if root element was replaced in one of tool.xml files, it needs to be fetched here for further processing
-	    root = (Element) ToolContentVersionFilter.renameClass(root, renamed.getKey(), renamed.getValue());
-	}
-
-	// remove fields
 	NodeList children = root.getChildNodes();
 	for (int childIndex = 0; childIndex < children.getLength(); childIndex++) {
 	    Node node = children.item(childIndex);
@@ -257,13 +256,6 @@
 	    node = ToolContentVersionFilter.renameNode(node, exactOldName, exactNewName);
 	}
 
-	// go through children and see if they need renaming too
-	NodeList children = node.getChildNodes();
-	for (int childIndex = 0; childIndex < children.getLength(); childIndex++) {
-	    Node childNode = children.item(childIndex);
-	    ToolContentVersionFilter.renameClass(childNode, oldName, newName);
-	}
-
 	return node;
     }