diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index c679c9e4ff..4cbd585986 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -256,26 +256,26 @@ if (!build_with_chromium) {
     proto_library("chart_proto") {
       visibility = [ "*" ]
       sources = [
-        "event_log_visualizer/proto/chart.proto",
-        "event_log_visualizer/proto/chart_enums.proto",
+        "rtc_event_log_visualizer/proto/chart.proto",
+        "rtc_event_log_visualizer/proto/chart_enums.proto",
       ]
-      proto_out_dir = "rtc_tools/event_log_visualizer/proto"
+      proto_out_dir = "rtc_tools/rtc_event_log_visualizer/proto"
     }
 
     rtc_static_library("event_log_visualizer_utils") {
       visibility = [ "*" ]
       sources = [
-        "event_log_visualizer/analyzer.cc",
-        "event_log_visualizer/analyzer.h",
-        "event_log_visualizer/log_simulation.cc",
-        "event_log_visualizer/log_simulation.h",
-        "event_log_visualizer/plot_base.cc",
-        "event_log_visualizer/plot_base.h",
-        "event_log_visualizer/plot_protobuf.cc",
-        "event_log_visualizer/plot_protobuf.h",
-        "event_log_visualizer/plot_python.cc",
-        "event_log_visualizer/plot_python.h",
-        "event_log_visualizer/triage_notifications.h",
+        "rtc_event_log_visualizer/analyzer.cc",
+        "rtc_event_log_visualizer/analyzer.h",
+        "rtc_event_log_visualizer/log_simulation.cc",
+        "rtc_event_log_visualizer/log_simulation.h",
+        "rtc_event_log_visualizer/plot_base.cc",
+        "rtc_event_log_visualizer/plot_base.h",
+        "rtc_event_log_visualizer/plot_protobuf.cc",
+        "rtc_event_log_visualizer/plot_protobuf.h",
+        "rtc_event_log_visualizer/plot_python.cc",
+        "rtc_event_log_visualizer/plot_python.h",
+        "rtc_event_log_visualizer/triage_notifications.h",
       ]
       defines = [ "ENABLE_RTC_EVENT_LOG" ]
       deps = [
@@ -319,7 +319,7 @@ if (rtc_include_tests) {
     rtc_executable("event_log_visualizer") {
       testonly = true
       sources = [
-        "event_log_visualizer/main.cc",
+        "rtc_event_log_visualizer/main.cc",
       ]
 
       defines = [ "ENABLE_RTC_EVENT_LOG" ]
diff --git a/rtc_tools/event_log_visualizer/OWNERS b/rtc_tools/rtc_event_log_visualizer/OWNERS
similarity index 100%
rename from rtc_tools/event_log_visualizer/OWNERS
rename to rtc_tools/rtc_event_log_visualizer/OWNERS
diff --git a/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/rtc_event_log_visualizer/analyzer.cc
similarity index 99%
rename from rtc_tools/event_log_visualizer/analyzer.cc
rename to rtc_tools/rtc_event_log_visualizer/analyzer.cc
index 79eed2ba5f..4c82a216a4 100644
--- a/rtc_tools/event_log_visualizer/analyzer.cc
+++ b/rtc_tools/rtc_event_log_visualizer/analyzer.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_tools/event_log_visualizer/analyzer.h"
+#include "rtc_tools/rtc_event_log_visualizer/analyzer.h"
 
 #include <algorithm>
 #include <cmath>
@@ -59,7 +59,7 @@
 #include "rtc_base/numerics/sequence_number_util.h"
 #include "rtc_base/rate_statistics.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_tools/event_log_visualizer/log_simulation.h"
+#include "rtc_tools/rtc_event_log_visualizer/log_simulation.h"
 
 #ifndef BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
 #define BWE_TEST_LOGGING_COMPILE_TIME_ENABLE 0
diff --git a/rtc_tools/event_log_visualizer/analyzer.h b/rtc_tools/rtc_event_log_visualizer/analyzer.h
similarity index 97%
rename from rtc_tools/event_log_visualizer/analyzer.h
rename to rtc_tools/rtc_event_log_visualizer/analyzer.h
index 7551ebfa5c..c4f722069b 100644
--- a/rtc_tools/event_log_visualizer/analyzer.h
+++ b/rtc_tools/rtc_event_log_visualizer/analyzer.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_
-#define RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_
+#ifndef RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_ANALYZER_H_
+#define RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_ANALYZER_H_
 
 #include <map>
 #include <memory>
@@ -21,8 +21,8 @@
 #include "logging/rtc_event_log/rtc_event_log_parser.h"
 #include "modules/audio_coding/neteq/tools/neteq_stats_getter.h"
 #include "rtc_base/strings/string_builder.h"
-#include "rtc_tools/event_log_visualizer/plot_base.h"
-#include "rtc_tools/event_log_visualizer/triage_notifications.h"
+#include "rtc_tools/rtc_event_log_visualizer/plot_base.h"
+#include "rtc_tools/rtc_event_log_visualizer/triage_notifications.h"
 
 namespace webrtc {
 
@@ -302,4 +302,4 @@ class EventLogAnalyzer {
 
 }  // namespace webrtc
 
-#endif  // RTC_TOOLS_EVENT_LOG_VISUALIZER_ANALYZER_H_
+#endif  // RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_ANALYZER_H_
diff --git a/rtc_tools/event_log_visualizer/log_simulation.cc b/rtc_tools/rtc_event_log_visualizer/log_simulation.cc
similarity index 99%
rename from rtc_tools/event_log_visualizer/log_simulation.cc
rename to rtc_tools/rtc_event_log_visualizer/log_simulation.cc
index 818775d145..e3399a8c9c 100644
--- a/rtc_tools/event_log_visualizer/log_simulation.cc
+++ b/rtc_tools/rtc_event_log_visualizer/log_simulation.cc
@@ -7,7 +7,7 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#include "rtc_tools/event_log_visualizer/log_simulation.h"
+#include "rtc_tools/rtc_event_log_visualizer/log_simulation.h"
 
 #include <algorithm>
 #include <utility>
diff --git a/rtc_tools/event_log_visualizer/log_simulation.h b/rtc_tools/rtc_event_log_visualizer/log_simulation.h
similarity index 92%
rename from rtc_tools/event_log_visualizer/log_simulation.h
rename to rtc_tools/rtc_event_log_visualizer/log_simulation.h
index 0387e3be98..480368dc99 100644
--- a/rtc_tools/event_log_visualizer/log_simulation.h
+++ b/rtc_tools/rtc_event_log_visualizer/log_simulation.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef RTC_TOOLS_EVENT_LOG_VISUALIZER_LOG_SIMULATION_H_
-#define RTC_TOOLS_EVENT_LOG_VISUALIZER_LOG_SIMULATION_H_
+#ifndef RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_LOG_SIMULATION_H_
+#define RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_LOG_SIMULATION_H_
 
 #include <deque>
 #include <functional>
@@ -61,4 +61,4 @@ class LogBasedNetworkControllerSimulation {
 };
 }  // namespace webrtc
 
-#endif  // RTC_TOOLS_EVENT_LOG_VISUALIZER_LOG_SIMULATION_H_
+#endif  // RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_LOG_SIMULATION_H_
diff --git a/rtc_tools/event_log_visualizer/main.cc b/rtc_tools/rtc_event_log_visualizer/main.cc
similarity index 98%
rename from rtc_tools/event_log_visualizer/main.cc
rename to rtc_tools/rtc_event_log_visualizer/main.cc
index 29e96ce72f..48adb5b23b 100644
--- a/rtc_tools/event_log_visualizer/main.cc
+++ b/rtc_tools/rtc_event_log_visualizer/main.cc
@@ -29,10 +29,10 @@
 #include "modules/audio_coding/neteq/include/neteq.h"
 #include "modules/rtp_rtcp/source/rtcp_packet/report_block.h"
 #include "rtc_base/checks.h"
-#include "rtc_tools/event_log_visualizer/analyzer.h"
-#include "rtc_tools/event_log_visualizer/plot_base.h"
-#include "rtc_tools/event_log_visualizer/plot_protobuf.h"
-#include "rtc_tools/event_log_visualizer/plot_python.h"
+#include "rtc_tools/rtc_event_log_visualizer/analyzer.h"
+#include "rtc_tools/rtc_event_log_visualizer/plot_base.h"
+#include "rtc_tools/rtc_event_log_visualizer/plot_protobuf.h"
+#include "rtc_tools/rtc_event_log_visualizer/plot_python.h"
 #include "system_wrappers/include/field_trial.h"
 #include "test/field_trial.h"
 #include "test/testsupport/file_utils.h"
diff --git a/rtc_tools/event_log_visualizer/plot_base.cc b/rtc_tools/rtc_event_log_visualizer/plot_base.cc
similarity index 98%
rename from rtc_tools/event_log_visualizer/plot_base.cc
rename to rtc_tools/rtc_event_log_visualizer/plot_base.cc
index 2308144522..8d3a677b21 100644
--- a/rtc_tools/event_log_visualizer/plot_base.cc
+++ b/rtc_tools/rtc_event_log_visualizer/plot_base.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_tools/event_log_visualizer/plot_base.h"
+#include "rtc_tools/rtc_event_log_visualizer/plot_base.h"
 
 #include <algorithm>
 
diff --git a/rtc_tools/event_log_visualizer/plot_base.h b/rtc_tools/rtc_event_log_visualizer/plot_base.h
similarity index 96%
rename from rtc_tools/event_log_visualizer/plot_base.h
rename to rtc_tools/rtc_event_log_visualizer/plot_base.h
index bd6d653f91..5e4ebfa522 100644
--- a/rtc_tools/event_log_visualizer/plot_base.h
+++ b/rtc_tools/rtc_event_log_visualizer/plot_base.h
@@ -7,8 +7,8 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
-#define RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
+#ifndef RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
+#define RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
 
 #include <memory>
 #include <string>
@@ -179,9 +179,9 @@ class PlotCollection {
   virtual Plot* AppendNewPlot() = 0;
 
  protected:
-  std::vector<std::unique_ptr<Plot> > plots_;
+  std::vector<std::unique_ptr<Plot>> plots_;
 };
 
 }  // namespace webrtc
 
-#endif  // RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
+#endif  // RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_BASE_H_
diff --git a/rtc_tools/event_log_visualizer/plot_protobuf.cc b/rtc_tools/rtc_event_log_visualizer/plot_protobuf.cc
similarity index 98%
rename from rtc_tools/event_log_visualizer/plot_protobuf.cc
rename to rtc_tools/rtc_event_log_visualizer/plot_protobuf.cc
index 9b05093554..9e82c01ba6 100644
--- a/rtc_tools/event_log_visualizer/plot_protobuf.cc
+++ b/rtc_tools/rtc_event_log_visualizer/plot_protobuf.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_tools/event_log_visualizer/plot_protobuf.h"
+#include "rtc_tools/rtc_event_log_visualizer/plot_protobuf.h"
 
 #include <stddef.h>
 
diff --git a/rtc_tools/event_log_visualizer/plot_protobuf.h b/rtc_tools/rtc_event_log_visualizer/plot_protobuf.h
similarity index 76%
rename from rtc_tools/event_log_visualizer/plot_protobuf.h
rename to rtc_tools/rtc_event_log_visualizer/plot_protobuf.h
index b81515a535..738247a309 100644
--- a/rtc_tools/event_log_visualizer/plot_protobuf.h
+++ b/rtc_tools/rtc_event_log_visualizer/plot_protobuf.h
@@ -7,14 +7,14 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
-#define RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
+#ifndef RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
+#define RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
 
 #include "rtc_base/ignore_wundef.h"
 RTC_PUSH_IGNORING_WUNDEF()
-#include "rtc_tools/event_log_visualizer/proto/chart.pb.h"
+#include "rtc_tools/rtc_event_log_visualizer/proto/chart.pb.h"
 RTC_POP_IGNORING_WUNDEF()
-#include "rtc_tools/event_log_visualizer/plot_base.h"
+#include "rtc_tools/rtc_event_log_visualizer/plot_base.h"
 
 namespace webrtc {
 
@@ -37,4 +37,4 @@ class ProtobufPlotCollection final : public PlotCollection {
 
 }  // namespace webrtc
 
-#endif  // RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
+#endif  // RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
diff --git a/rtc_tools/event_log_visualizer/plot_python.cc b/rtc_tools/rtc_event_log_visualizer/plot_python.cc
similarity index 99%
rename from rtc_tools/event_log_visualizer/plot_python.cc
rename to rtc_tools/rtc_event_log_visualizer/plot_python.cc
index 917ea11725..3841555785 100644
--- a/rtc_tools/event_log_visualizer/plot_python.cc
+++ b/rtc_tools/rtc_event_log_visualizer/plot_python.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "rtc_tools/event_log_visualizer/plot_python.h"
+#include "rtc_tools/rtc_event_log_visualizer/plot_python.h"
 
 #include <stdio.h>
 
diff --git a/rtc_tools/event_log_visualizer/plot_python.h b/rtc_tools/rtc_event_log_visualizer/plot_python.h
similarity index 78%
rename from rtc_tools/event_log_visualizer/plot_python.h
rename to rtc_tools/rtc_event_log_visualizer/plot_python.h
index 23a0a92da5..dcdcf23fcf 100644
--- a/rtc_tools/event_log_visualizer/plot_python.h
+++ b/rtc_tools/rtc_event_log_visualizer/plot_python.h
@@ -7,10 +7,10 @@
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
-#ifndef RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
-#define RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
+#ifndef RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
+#define RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
 
-#include "rtc_tools/event_log_visualizer/plot_base.h"
+#include "rtc_tools/rtc_event_log_visualizer/plot_base.h"
 
 namespace webrtc {
 
@@ -34,4 +34,4 @@ class PythonPlotCollection final : public PlotCollection {
 
 }  // namespace webrtc
 
-#endif  // RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
+#endif  // RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_
diff --git a/rtc_tools/event_log_visualizer/proto/chart.proto b/rtc_tools/rtc_event_log_visualizer/proto/chart.proto
similarity index 100%
rename from rtc_tools/event_log_visualizer/proto/chart.proto
rename to rtc_tools/rtc_event_log_visualizer/proto/chart.proto
diff --git a/rtc_tools/event_log_visualizer/proto/chart_enums.proto b/rtc_tools/rtc_event_log_visualizer/proto/chart_enums.proto
similarity index 100%
rename from rtc_tools/event_log_visualizer/proto/chart_enums.proto
rename to rtc_tools/rtc_event_log_visualizer/proto/chart_enums.proto
diff --git a/rtc_tools/event_log_visualizer/triage_notifications.h b/rtc_tools/rtc_event_log_visualizer/triage_notifications.h
similarity index 95%
rename from rtc_tools/event_log_visualizer/triage_notifications.h
rename to rtc_tools/rtc_event_log_visualizer/triage_notifications.h
index 49e0620934..23b31ece42 100644
--- a/rtc_tools/event_log_visualizer/triage_notifications.h
+++ b/rtc_tools/rtc_event_log_visualizer/triage_notifications.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef RTC_TOOLS_EVENT_LOG_VISUALIZER_TRIAGE_NOTIFICATIONS_H_
-#define RTC_TOOLS_EVENT_LOG_VISUALIZER_TRIAGE_NOTIFICATIONS_H_
+#ifndef RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_TRIAGE_NOTIFICATIONS_H_
+#define RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_TRIAGE_NOTIFICATIONS_H_
 
 #include <string>
 
@@ -155,4 +155,4 @@ class OutgoingHighLoss {
 
 }  // namespace webrtc
 
-#endif  // RTC_TOOLS_EVENT_LOG_VISUALIZER_TRIAGE_NOTIFICATIONS_H_
+#endif  // RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_TRIAGE_NOTIFICATIONS_H_