diff --git a/src/libslic3r/Config.cpp b/src/libslic3r/Config.cpp
index 08f679b5c8..09b48f69ba 100644
--- a/src/libslic3r/Config.cpp
+++ b/src/libslic3r/Config.cpp
@@ -1190,11 +1190,10 @@ ConfigSubstitutions ConfigBase::load_from_gcode_file(const std::string &file, Fo
     bool has_delimiters = true;
     {
         //BBS
-        std::string bambuslicer_gcode_header = "; ";
-        bambuslicer_gcode_header += SLIC3R_APP_NAME;
+        std::string bambuslicer_gcode_header = "; BambuStudio";
 
         std::string orcaslicer_gcode_header = std::string("; generated by ");
-        orcaslicer_gcode_header += Slic3r::header_slic3r_generated();
+        orcaslicer_gcode_header += SLIC3R_APP_NAME;
 
         std::string header;
         bool        header_found = false;
diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp
index 9c6ace3487..bbd23f4a1e 100644
--- a/src/libslic3r/GCode/GCodeProcessor.cpp
+++ b/src/libslic3r/GCode/GCodeProcessor.cpp
@@ -839,6 +839,7 @@ const std::vector<std::pair<GCodeProcessor::EProducer, std::string>> GCodeProces
     //BBS: OrcaSlicer is also "bambu". Otherwise the time estimation didn't work.
     //FIXME: Workaround and should be handled when do removing-bambu
     { EProducer::BambuStudio, SLIC3R_APP_NAME },
+    { EProducer::BambuStudio, "generated by OrcaSlicer" },
     { EProducer::BambuStudio, "generated by BambuStudio" },
     { EProducer::BambuStudio, "BambuStudio" }
     //{ EProducer::Slic3rPE,    "generated by Slic3r Bambu Edition" },
diff --git a/src/libslic3r/libslic3r.h b/src/libslic3r/libslic3r.h
index 1b012d348d..f7bc9c495d 100644
--- a/src/libslic3r/libslic3r.h
+++ b/src/libslic3r/libslic3r.h
@@ -5,7 +5,7 @@
 #define SLIC3R_APP_FULL_NAME "Orca Slicer"
 #define GCODEVIEWER_APP_NAME "BambuStudio G-code Viewer"
 #define GCODEVIEWER_APP_KEY  "BambuStudioGcodeViewer"
-#define GCODEVIEWER_BUILD_ID std::string("BambuStudio G-code Viewer-") + std::string(SLIC3R_VERSION) + std::string("-RC")
+#define GCODEVIEWER_BUILD_ID std::string("OrcaSlicer G-code Viewer-") + std::string(SLIC3R_VERSION) + std::string("-RC")
 
 // this needs to be included early for MSVC (listing it in Build.PL is not enough)
 #include <memory>