From f30c67a478526cd51a4d282bb50e218992c5b059 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 18 Apr 2021 16:23:15 +0100
Subject: [PATCH] Symbols need to be unannotated when updating their
 references.

Fixes https://gitlab.com/kicad/code/kicad/issues/8223
---
 eeschema/dialogs/dialog_change_symbols.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eeschema/dialogs/dialog_change_symbols.cpp b/eeschema/dialogs/dialog_change_symbols.cpp
index 1235d38843..9b16efb74c 100644
--- a/eeschema/dialogs/dialog_change_symbols.cpp
+++ b/eeschema/dialogs/dialog_change_symbols.cpp
@@ -2,6 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2020-2021 CERN
+ * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * @author Wayne Stambaugh <stambaughw@gmail.com>
  *
@@ -25,7 +26,7 @@
 #include <kicad_string.h>   // WildCompareString
 #include <kiway.h>
 #include <lib_id.h>
-
+#include <refdes_utils.h>
 #include <core/kicad_algo.h>
 #include <dialog_change_symbols.h>
 #include <sch_symbol.h>
@@ -36,7 +37,6 @@
 #include <template_fieldnames.h>
 #include <wx_html_report_panel.h>
 
-
 bool g_selectRefDes = false;
 bool g_selectValue  = false;
                                 // { change, update }
@@ -592,7 +592,7 @@ bool DIALOG_CHANGE_SYMBOLS::processSymbol( SCH_COMPONENT* aSymbol, const SCH_SHE
             if( resetText )
             {
                 if( i == REFERENCE_FIELD )
-                    aSymbol->SetRef( aInstance, libField->GetText() );
+                    aSymbol->SetRef( aInstance, UTIL::GetRefDesUnannotated( libField->GetText() ) );
                 else if( i == VALUE_FIELD )
                     aSymbol->SetValue( aInstance, libField->GetText() );
                 else if( i == FOOTPRINT_FIELD )