2 files changed, 6 insertions, 3 deletions

diff --git a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
index 6a7d2fd1..694d4321 100644
--- a/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
+++ b/enigma-server/src/main/java/cuchaz/enigma/network/packet/RenameC2SPacket.java
@@ -4,10 +4,10 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 
+import cuchaz.enigma.network.Message;
 import cuchaz.enigma.network.ServerPacketHandler;
 import cuchaz.enigma.translation.mapping.EntryMapping;
 import cuchaz.enigma.translation.representation.entry.Entry;
-import cuchaz.enigma.network.Message;
 import cuchaz.enigma.utils.validation.PrintValidatable;
 import cuchaz.enigma.utils.validation.ValidationContext;
 
@@ -47,7 +47,8 @@ public class RenameC2SPacket implements Packet<ServerPacketHandler> {
                 boolean valid = handler.getServer().canModifyEntry(handler.getClient(), entry);
 
                 if (valid) {
-                        handler.getServer().getMappings().mapFromObf(vc, entry, new EntryMapping(newName));
+                        EntryMapping previous = handler.getServer().getMappings().getDeobfMapping(entry);
+                        handler.getServer().getMappings().mapFromObf(vc, entry, previous != null ? previous.withName(newName) : new EntryMapping(newName));
                         valid = vc.canProceed();
                 }
 
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
index 10f36b85..15afeed1 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -28,6 +28,7 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
 import com.google.common.collect.Lists;
+
 import cuchaz.enigma.Enigma;
 import cuchaz.enigma.EnigmaProfile;
 import cuchaz.enigma.EnigmaProject;
@@ -422,7 +423,8 @@ public class GuiController implements ClientPacketHandler {
 
         public void rename(ValidationContext vc, EntryReference<Entry<?>, Entry<?>> reference, String newName, boolean refreshClassTree, boolean validateOnly) {
                 Entry<?> entry = reference.getNameableEntry();
-                project.getMapper().mapFromObf(vc, entry, new EntryMapping(newName), true, validateOnly);
+                EntryMapping previous = project.getMapper().getDeobfMapping(entry);
+                project.getMapper().mapFromObf(vc, entry, previous != null ? previous.withName(newName) : new EntryMapping(newName), true, validateOnly);
 
                 if (validateOnly || !vc.canProceed()) return;