diff --git a/techlibs/rapidflex/src/clock_buffer_cmd.cc b/techlibs/rapidflex/src/clock_buffer_cmd.cc
index 72536c2d8..5f642fb70 100644
--- a/techlibs/rapidflex/src/clock_buffer_cmd.cc
+++ b/techlibs/rapidflex/src/clock_buffer_cmd.cc
@@ -15,7 +15,7 @@ PRIVATE_NAMESPACE_BEGIN
 
 struct InsertClockBuffer : public Pass {
   InsertClockBuffer()
-      : Pass("insert_clock_buffer",
+      : Pass("rapidflex_insert_clock_buffer",
              "This command is to insert clock buffer into the design") {}
 
   /*utility function used by insert_ckbuff; copied from blif.cc*/
@@ -519,7 +519,7 @@ struct InsertClockBuffer : public Pass {
   }
 
   void execute(std::vector<std::string> args, RTLIL::Design *design) override {
-    log("Arguments to the command insert_clock_buffer:\n");
+    log("Arguments to the command rapidflex_insert_clock_buffer:\n");
     std::string top_module_name;
     std::string cell_map_file;
     for (size_t i = 0; i < args.size(); i++) {
@@ -576,6 +576,6 @@ struct InsertClockBuffer : public Pass {
     }
     design->check();
   }
-} Insert_clock_buffer;
+} rapidflex_insert_clock_buffer;
 
 PRIVATE_NAMESPACE_END
diff --git a/techlibs/rapidflex/src/synth_rapidflex.cc b/techlibs/rapidflex/src/synth_rapidflex.cc
index a4cca763e..4d38cfa89 100644
--- a/techlibs/rapidflex/src/synth_rapidflex.cc
+++ b/techlibs/rapidflex/src/synth_rapidflex.cc
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright 2020-2024 RapidFlex
  */
 #include "kernel/celltypes.h"
@@ -476,8 +476,12 @@ struct SynthRapidFlexPass : public ScriptPass {
 
     if (check_label("insert_clock_buffer", "(if -insert_clock_buffer)")) {
       if (insert_clock_buffer) {
-        run(stringf("insert_clock_buffer -top %s -cell_map_file %s",
-                    top_opt.c_str(), cell_map_file.c_str()));
+        if (top_opt == "-auto-top")
+          run(stringf("rapidflex_insert_clock_buffer -cell_map_file %s",
+                      cell_map_file.c_str()));
+        else
+          run(stringf("rapidflex_insert_clock_buffer %s -cell_map_file %s",
+                      top_opt.c_str(), cell_map_file.c_str()));
       }
     }