diff --git a/src/main.zig b/src/main.zig
index 5a92387..9aaf641 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -157,18 +157,21 @@ fn runServer() !void {
         defer alloc.free(req.str);
 
         if (mappings.get(req.str)) |mapping| {
-            const res = StringPacket{ .str = mapping.mapped };
+            const renamed = renames.get(mapping.mapped);
+            const res = StringPacket{ .str = renamed orelse mapping.mapped };
             try res.write(con.stream.writer());
 
             std.log.info(
                 \\
                 \\    Unmapped: {s}
                 \\    Mapped:   {s}
+                \\    Renamed:  {s}
                 \\
                 \\    Doc: {s}
             , .{
                 req.str,
                 mapping.mapped,
+                renamed orelse "<no rename>",
                 mapping.doc orelse "<no docs>",
             });
         } else {