diff --git a/compiler-rt/lib/orc/elfnix_platform.cpp b/compiler-rt/lib/orc/elfnix_platform.cpp
index e0813a40f1e3a5d..57673f088f77cb0 100644
--- a/compiler-rt/lib/orc/elfnix_platform.cpp
+++ b/compiler-rt/lib/orc/elfnix_platform.cpp
@@ -15,7 +15,7 @@
 #include "compiler.h"
 #include "error.h"
 #include "jit_dispatch.h"
-#include "sections_tracker.h"
+#include "record_section_tracker.h"
 #include "wrapper_function_utils.h"
 
 #include <algorithm>
diff --git a/compiler-rt/lib/orc/macho_platform.cpp b/compiler-rt/lib/orc/macho_platform.cpp
index a65e5b94eb4f406..afd90c791ae1357 100644
--- a/compiler-rt/lib/orc/macho_platform.cpp
+++ b/compiler-rt/lib/orc/macho_platform.cpp
@@ -17,7 +17,7 @@
 #include "error.h"
 #include "interval_map.h"
 #include "jit_dispatch.h"
-#include "sections_tracker.h"
+#include "record_section_tracker.h"
 #include "wrapper_function_utils.h"
 
 #include <algorithm>
diff --git a/compiler-rt/lib/orc/sections_tracker.h b/compiler-rt/lib/orc/record_section_tracker.h
similarity index 93%
rename from compiler-rt/lib/orc/sections_tracker.h
rename to compiler-rt/lib/orc/record_section_tracker.h
index 10851c47aa49e59..1ac729a9539196f 100644
--- a/compiler-rt/lib/orc/sections_tracker.h
+++ b/compiler-rt/lib/orc/record_section_tracker.h
@@ -1,5 +1,4 @@
-//===- sections_tracker.h - RecordSectionsTracker utilities for the ORC runtime
-//----------*- C++ -*-===//
+//===- record_section_tracker.h -- for fixed-sized record sects -*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -12,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef ORC_RT_SECTIONSTRACKER_H
-#define ORC_RT_SECTIONSTRACKER_H
+#ifndef ORC_RT_RECORD_SECTION_TRACKER_H
+#define ORC_RT_RECORD_SECTION_TRACKER_H
 
 #include "error.h"
 #include "executor_address.h"
@@ -111,4 +110,4 @@ template <typename RecordElement> class RecordSectionsTracker {
 
 } // namespace orc_rt
 
-#endif // ORC_RT_SECTIONSTRACKER_H
+#endif // ORC_RT_RECORD_SECTION_TRACKER_H