diff --git a/reactos/tools/rbuild/stubbedcomponent.cpp b/reactos/tools/rbuild/stubbedcomponent.cpp
index 5a71e902c25..77e3a18f336 100644
--- a/reactos/tools/rbuild/stubbedcomponent.cpp
+++ b/reactos/tools/rbuild/stubbedcomponent.cpp
@@ -72,13 +72,13 @@ StubbedSymbol::ProcessXML ()
 	}
 	symbol = node.value;
 
+	strippedName = StripSymbol ( symbol );
+
 	const XMLAttribute* att = node.GetAttribute ( "newname", false );
 	if ( att != NULL )
 		newname = att->value;
 	else
-		newname = symbol;
-
-	strippedName = StripSymbol ( symbol );
+		newname = strippedName;
 }
 
 string
diff --git a/reactos/tools/rbuild/testsupportcode.cpp b/reactos/tools/rbuild/testsupportcode.cpp
index 8569ebfc1ba..d67f2d62a3a 100644
--- a/reactos/tools/rbuild/testsupportcode.cpp
+++ b/reactos/tools/rbuild/testsupportcode.cpp
@@ -63,7 +63,7 @@ TestSupportCode::WriteStubbedSymbolToHooksFile ( char* buffer,
 	buffer = buffer + sprintf ( buffer,
 	                            "  {\"%s\", \"%s\", NULL, NULL, NULL},\n",
 	                            component.name.c_str (),
-	                            symbol.strippedName.c_str () );
+	                            symbol.newname.c_str () );
 	return buffer;
 }