diff --git a/src/buddies/src/bd/strmxor.cc b/src/buddies/src/bd/strmxor.cc
index 33d8e6ca3..b4797bca1 100644
--- a/src/buddies/src/bd/strmxor.cc
+++ b/src/buddies/src/bd/strmxor.cc
@@ -360,7 +360,7 @@ BD_PUBLIC int strmxor (int argc, char *argv[])
   generic_reader_options_b.set_group_prefix ("Input B");
 
   std::string infile_a, infile_b, output;
-  std::string top_a, top_b;
+  std::string top_a, top_b, top_output;
   bool dont_summarize_missing_layers = false;
   bool silent = false;
   bool no_summary = false;
@@ -393,6 +393,10 @@ BD_PUBLIC int strmxor (int argc, char *argv[])
       << tl::arg ("-tb|--top-b=name",          &top_b,      "Specifies the top cell for the second layout",
                   "See --top-a for details."
                  )
+      << tl::arg ("-to|--top-output=name",     &top_output, "Specifies the top cell for the output layout",
+                  "This option is only used if an output layout is given. It will specify the name of top cell to use there. "
+                  "If not specified, KLayout uses the top cell name of the first layout or the one given with --top-a."
+                 )
       << tl::arg ("-u|--deep",                 &deep,       "Deep (hierarchical mode)",
                   "Enables hierarchical XOR (experimental). In this mode, tiling is not supported "
                   "and the tiling arguments are ignored."
@@ -518,7 +522,7 @@ BD_PUBLIC int strmxor (int argc, char *argv[])
 
   if (! output.empty ()) {
     output_layout.reset (new db::Layout ());
-    output_top = output_layout->add_cell ("XOR");
+    output_top = output_layout->add_cell (top_output.empty () ? top_a.c_str () : top_output.c_str ());
   }
 
   std::map<std::pair<int, db::LayerProperties>, ResultDescriptor> results;
diff --git a/testdata/bd/strmxor_au1.oas b/testdata/bd/strmxor_au1.oas
index 93919a14e..5516527dd 100644
Binary files a/testdata/bd/strmxor_au1.oas and b/testdata/bd/strmxor_au1.oas differ
diff --git a/testdata/bd/strmxor_au1d.oas b/testdata/bd/strmxor_au1d.oas
index 012da7843..a90086579 100644
Binary files a/testdata/bd/strmxor_au1d.oas and b/testdata/bd/strmxor_au1d.oas differ
diff --git a/testdata/bd/strmxor_au2.oas b/testdata/bd/strmxor_au2.oas
index f88ca5cbd..dfbe699e2 100644
Binary files a/testdata/bd/strmxor_au2.oas and b/testdata/bd/strmxor_au2.oas differ
diff --git a/testdata/bd/strmxor_au2d.oas b/testdata/bd/strmxor_au2d.oas
index fcef4685e..da3127ce7 100644
Binary files a/testdata/bd/strmxor_au2d.oas and b/testdata/bd/strmxor_au2d.oas differ
diff --git a/testdata/bd/strmxor_au3.oas b/testdata/bd/strmxor_au3.oas
index 6206bfe2d..6ea7c70d4 100644
Binary files a/testdata/bd/strmxor_au3.oas and b/testdata/bd/strmxor_au3.oas differ
diff --git a/testdata/bd/strmxor_au3_heal.oas b/testdata/bd/strmxor_au3_heal.oas
index 0faf2da27..29700b89a 100644
Binary files a/testdata/bd/strmxor_au3_heal.oas and b/testdata/bd/strmxor_au3_heal.oas differ
diff --git a/testdata/bd/strmxor_au3d.oas b/testdata/bd/strmxor_au3d.oas
index 012da7843..a90086579 100644
Binary files a/testdata/bd/strmxor_au3d.oas and b/testdata/bd/strmxor_au3d.oas differ
diff --git a/testdata/bd/strmxor_au4.oas b/testdata/bd/strmxor_au4.oas
index 67526e2d4..8437417d9 100644
Binary files a/testdata/bd/strmxor_au4.oas and b/testdata/bd/strmxor_au4.oas differ
diff --git a/testdata/bd/strmxor_au4_heal.oas b/testdata/bd/strmxor_au4_heal.oas
index b6301286e..e8875bf50 100644
Binary files a/testdata/bd/strmxor_au4_heal.oas and b/testdata/bd/strmxor_au4_heal.oas differ
diff --git a/testdata/bd/strmxor_au4d.oas b/testdata/bd/strmxor_au4d.oas
index 996d58443..0724ac6fe 100644
Binary files a/testdata/bd/strmxor_au4d.oas and b/testdata/bd/strmxor_au4d.oas differ
diff --git a/testdata/bd/strmxor_au5.oas b/testdata/bd/strmxor_au5.oas
index 7d444c232..a032116c6 100644
Binary files a/testdata/bd/strmxor_au5.oas and b/testdata/bd/strmxor_au5.oas differ
diff --git a/testdata/bd/strmxor_au5d.oas b/testdata/bd/strmxor_au5d.oas
index fed55a713..ab41c95ad 100644
Binary files a/testdata/bd/strmxor_au5d.oas and b/testdata/bd/strmxor_au5d.oas differ
diff --git a/testdata/bd/strmxor_au6.oas b/testdata/bd/strmxor_au6.oas
index 64faa866c..1580f4c2f 100644
Binary files a/testdata/bd/strmxor_au6.oas and b/testdata/bd/strmxor_au6.oas differ
diff --git a/testdata/bd/strmxor_au6d.oas b/testdata/bd/strmxor_au6d.oas
index 2b90eba60..909af0996 100644
Binary files a/testdata/bd/strmxor_au6d.oas and b/testdata/bd/strmxor_au6d.oas differ