diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 524b7cbf27c..d38f2a48c73 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -165,7 +165,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
            ../sql/opt_hints_parser.cc ../sql/opt_hints_parser.h
            ../sql/scan_char.h
            ../sql/opt_hints.cc ../sql/opt_hints.h
-           ../sql/opt_store_replay_context.cc ../sql/opt_store_replay_context.h
+           ../sql/opt_context_store_replay.cc ../sql/opt_context_store_replay.h
            ../sql/sql_path.cc
            ../sql/sql_json_lib.cc ../sql/sql_json_lib.h
            ${GEN_SOURCES}
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 4dfb9c65da7..429a85f9cac 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -194,7 +194,7 @@ SET (SQL_SOURCE
                optimizer_costs.h optimizer_defaults.h
                opt_trace.cc
                sql_json_lib.cc
-               opt_store_replay_context.cc
+               opt_context_store_replay.cc
                table_cache.cc encryption.cc temporary_tables.cc
                json_table.cc
                proxy_protocol.cc backup.cc xa.cc
diff --git a/sql/opt_store_replay_context.cc b/sql/opt_context_store_replay.cc
similarity index 99%
rename from sql/opt_store_replay_context.cc
rename to sql/opt_context_store_replay.cc
index f8489f8b35a..f9edf005b28 100644
--- a/sql/opt_store_replay_context.cc
+++ b/sql/opt_context_store_replay.cc
@@ -16,7 +16,7 @@
    USA */
 
 #include "sql_plugin.h"
-#include "opt_store_replay_context.h"
+#include "opt_context_store_replay.h"
 #include "sql_show.h"
 #include "my_json_writer.h"
 #include "mysql.h"
diff --git a/sql/opt_store_replay_context.h b/sql/opt_context_store_replay.h
similarity index 98%
rename from sql/opt_store_replay_context.h
rename to sql/opt_context_store_replay.h
index bd8ad14ac05..27df0b7e107 100644
--- a/sql/opt_store_replay_context.h
+++ b/sql/opt_context_store_replay.h
@@ -15,8 +15,8 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335
    USA */
 
-#ifndef OPT_STORE_REPLAY_CONTEXT
-#define OPT_STORE_REPLAY_CONTEXT
+#ifndef OPT_CONTEXT_STORE_REPLAY
+#define OPT_CONTEXT_STORE_REPLAY
 
 #include "my_global.h"
 #include "sql_list.h"
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 5f3e46b9945..f660197f46d 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -60,7 +60,7 @@
 #include "ha_handler_stats.h"                    // ha_handler_stats */
 #include "sql_basic_types.h"                     // enum class active_dml_stmt
 #include "sql_trigger.h"
-#include "opt_store_replay_context.h"
+#include "opt_context_store_replay.h"
 
 extern "C"
 void set_thd_stage_info(void *thd,
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 2de54e8b540..801f6328d37 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -94,7 +94,7 @@
 #include "mysql/psi/mysql_sp.h"
 
 #include "my_json_writer.h"
-#include "opt_store_replay_context.h"
+#include "opt_context_store_replay.h"
 #define FLAGSTR(V,F) ((V)&(F)?#F" ":"")
 
 #ifdef WITH_ARIA_STORAGE_ENGINE