diff --git a/SConstruct b/SConstruct
index aebb989d4..945ddaa97 100644
--- a/SConstruct
+++ b/SConstruct
@@ -536,7 +536,7 @@ common.add_sources ([
 	'tags.cc',
 	'pcap-writer.cc',
 	'trace-container.cc',
-	'traced-variable-test.cc',
+	'variable-tracer-test.cc',
 	'stream-tracer-test.cc',
 	])
 common.add_inst_headers ([
@@ -545,9 +545,9 @@ common.add_inst_headers ([
 	'tags.h',
 	'packet.h',
 	'count-ptr-holder.tcc',
-	'ui-traced-variable.tcc',
-	'si-traced-variable.tcc',
-	'f-traced-variable.tcc',
+	'ui-variable-tracer.h',
+	'si-variable-tracer.h',
+	'f-variable-tracer.h',
 	'callback-tracer.h',
 	'stream-tracer.h',
 	'trace-container.h',
diff --git a/samples/main-trace.cc b/samples/main-trace.cc
index a38e00706..0c783f155 100644
--- a/samples/main-trace.cc
+++ b/samples/main-trace.cc
@@ -1,6 +1,6 @@
 /* -*-	Mode:C++; c-basic-offset:8; tab-width:8; indent-tabs-mode:t -*- */
 #include "ns3/trace-container.h"
-#include "ns3/ui-traced-variable.tcc"
+#include "ns3/ui-variable-tracer.h"
 #include "ns3/callback-tracer.h"
 #include "ns3/stream-tracer.h"
 #include "ns3/pcap-writer.h"
diff --git a/src/common/f-traced-variable.tcc b/src/common/f-variable-tracer.h
similarity index 100%
rename from src/common/f-traced-variable.tcc
rename to src/common/f-variable-tracer.h
diff --git a/src/common/si-traced-variable.tcc b/src/common/si-variable-tracer.h
similarity index 100%
rename from src/common/si-traced-variable.tcc
rename to src/common/si-variable-tracer.h
diff --git a/src/common/trace-container.h b/src/common/trace-container.h
index 8ac333f2d..f54583f25 100644
--- a/src/common/trace-container.h
+++ b/src/common/trace-container.h
@@ -22,9 +22,9 @@
 #ifndef TRACE_CONTAINER_H
 #define TRACE_CONTAINER_H
 
-#include "ui-traced-variable.tcc"
-#include "si-traced-variable.tcc"
-#include "f-traced-variable.tcc"
+#include "ui-variable-tracer.h"
+#include "si-variable-tracer.h"
+#include "f-variable-tracer.h"
 #include "callback-tracer.h"
 #include "ns3/callback.h"
 #include <list>
diff --git a/src/common/ui-traced-variable.tcc b/src/common/ui-variable-tracer.h
similarity index 100%
rename from src/common/ui-traced-variable.tcc
rename to src/common/ui-variable-tracer.h
diff --git a/src/common/traced-variable-test.cc b/src/common/variable-tracer-test.cc
similarity index 98%
rename from src/common/traced-variable-test.cc
rename to src/common/variable-tracer-test.cc
index 4ae872b92..cdae3c752 100644
--- a/src/common/traced-variable-test.cc
+++ b/src/common/variable-tracer-test.cc
@@ -19,8 +19,8 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 
-#include "ui-traced-variable.tcc"
-#include "si-traced-variable.tcc"
+#include "ui-variable-tracer.h"
+#include "si-variable-tracer.h"
 #include "ns3/test.h"
 #include "ns3/callback.h"