diff --git a/.hgignore b/.hgignore
index 90e70c089..7d79571a0 100644
--- a/.hgignore
+++ b/.hgignore
@@ -8,4 +8,4 @@
 ^doc/latex
 ^\.lock-wscript
 ^\.waf
-^doc/trace-source-list\.h$
+^doc/introspected-doxygen\.h$
diff --git a/doc/doxygen.conf b/doc/doxygen.conf
index 78592dd66..c5a2c8dac 100644
--- a/doc/doxygen.conf
+++ b/doc/doxygen.conf
@@ -495,7 +495,7 @@ WARN_LOGFILE           =
 
 INPUT                  = src \
                          doc/main.txt \
-                         doc/trace-source-list.h \
+                         doc/introspected-doxygen.h \
                          doc/tracing.h \
 
 # This tag can be used to specify the character encoding of the source files that 
diff --git a/utils/print-trace-sources.cc b/utils/print-introspected-doxygen.cc
similarity index 100%
rename from utils/print-trace-sources.cc
rename to utils/print-introspected-doxygen.cc
diff --git a/utils/wscript b/utils/wscript
index 390508478..8b8092334 100644
--- a/utils/wscript
+++ b/utils/wscript
@@ -28,9 +28,9 @@ def build(bld):
     obj = bld.create_ns3_program('replay-simulation', ['simulator'])
     obj.source = 'replay-simulation.cc'
 
-    obj = bld.create_ns3_program('print-trace-sources',
+    obj = bld.create_ns3_program('print-introspected-doxygen',
                                  ['internet-node', 'csma-cd', 'point-to-point'])
-    obj.source = 'print-trace-sources.cc'
+    obj.source = 'print-introspected-doxygen.cc'
 
     if env['ENABLE_MOBILITY_VISUALIZER']:
         obj = bld.create_ns3_program('mobility-visualizer',
diff --git a/wscript b/wscript
index 430675d1f..01b82f18a 100644
--- a/wscript
+++ b/wscript
@@ -215,8 +215,8 @@ def _run_waf_check():
     ## generate the trace sources list docs
     env = Params.g_build.env_of_name('default')
     proc_env = _get_proc_env()
-    prog = _find_program('print-trace-sources', env).m_linktask.m_outputs[0].abspath(env)
-    out = open('doc/trace-source-list.h', 'w')
+    prog = _find_program('print-introspected-doxygen', env).m_linktask.m_outputs[0].abspath(env)
+    out = open('doc/introspected-doxygen.h', 'w')
     if subprocess.Popen([prog], stdout=out, env=proc_env).wait():
         raise SystemExit(1)
     out.close()
@@ -354,8 +354,8 @@ def run_shell():
 
 
 def doxygen():
-    if not os.path.exists('doc/trace-source-list.h'):
-        Params.warning("doc/trace-source-list.h does not exist; run waf check to generate it.")
+    if not os.path.exists('doc/introspected-doxygen.h'):
+        Params.warning("doc/introspected-doxygen.h does not exist; run waf check to generate it.")
 
     ## run doxygen
     doxygen_config = os.path.join('doc', 'doxygen.conf')