diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 32fc69e11..0c1043661 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -70,14 +70,14 @@ lumigui_SOURCES =															\
 	$(lumigui_srcdir)/widgets/timeline/timeline-arrow-tool.hpp				\
 	$(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.cpp				\
 	$(lumigui_srcdir)/widgets/timeline/timeline-ibeam-tool.hpp				\
-	$(lumigui_srcdir)/widgets/timeline/track.cpp							\
-	$(lumigui_srcdir)/widgets/timeline/track.hpp							\
-	$(lumigui_srcdir)/widgets/timeline/clip-track.cpp						\
-	$(lumigui_srcdir)/widgets/timeline/clip-track.hpp						\
-	$(lumigui_srcdir)/widgets/timeline/group-track.cpp						\
-	$(lumigui_srcdir)/widgets/timeline/group-track.hpp						\
-	$(lumigui_srcdir)/widgets/timeline/clip.cpp								\
-	$(lumigui_srcdir)/widgets/timeline/clip.hpp								\
+	$(lumigui_srcdir)/widgets/timeline/timeline-track.cpp					\
+	$(lumigui_srcdir)/widgets/timeline/timeline-track.hpp					\
+	$(lumigui_srcdir)/widgets/timeline/timeline-clip-track.cpp				\
+	$(lumigui_srcdir)/widgets/timeline/timeline-clip-track.hpp				\
+	$(lumigui_srcdir)/widgets/timeline/timeline-group-track.cpp				\
+	$(lumigui_srcdir)/widgets/timeline/timeline-group-track.hpp				\
+	$(lumigui_srcdir)/widgets/timeline/timeline-clip.cpp					\
+	$(lumigui_srcdir)/widgets/timeline/timeline-clip.hpp					\
 	$(lumigui_srcdir)/model/project.cpp										\
 	$(lumigui_srcdir)/model/project.hpp										\
 	$(lumigui_srcdir)/model/sequence.cpp									\
diff --git a/src/gui/widgets/timeline-widget.hpp b/src/gui/widgets/timeline-widget.hpp
index d16457c18..df7fc51f2 100644
--- a/src/gui/widgets/timeline-widget.hpp
+++ b/src/gui/widgets/timeline-widget.hpp
@@ -33,8 +33,8 @@
 #include "timeline/timeline-tool.hpp"
 #include "timeline/timeline-arrow-tool.hpp"
 #include "timeline/timeline-ibeam-tool.hpp"
-#include "timeline/group-track.hpp"
-#include "timeline/clip-track.hpp"
+#include "timeline/timeline-group-track.hpp"
+#include "timeline/timeline-clip-track.hpp"
 
 namespace gui {
 namespace widgets {
diff --git a/src/gui/widgets/timeline/clip-track.cpp b/src/gui/widgets/timeline/timeline-clip-track.cpp
similarity index 92%
rename from src/gui/widgets/timeline/clip-track.cpp
rename to src/gui/widgets/timeline/timeline-clip-track.cpp
index d56e79df3..8e9e0bd2d 100644
--- a/src/gui/widgets/timeline/clip-track.cpp
+++ b/src/gui/widgets/timeline/timeline-clip-track.cpp
@@ -1,5 +1,5 @@
 /*
-  clip-track.cpp  -  Implementation of the timeline clip track object
+  timeline-clip-track.cpp  -  Implementation of the timeline clip track object
  
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -20,7 +20,7 @@
  
 * *****************************************************/
 
-#include "clip-track.hpp"
+#include "timeline-clip-track.hpp"
 #include "timeline-view-window.hpp"
 
 using namespace Gtk;
diff --git a/src/gui/widgets/timeline/clip-track.hpp b/src/gui/widgets/timeline/timeline-clip-track.hpp
similarity index 83%
rename from src/gui/widgets/timeline/clip-track.hpp
rename to src/gui/widgets/timeline/timeline-clip-track.hpp
index 6971bb402..5e53c83e2 100644
--- a/src/gui/widgets/timeline/clip-track.hpp
+++ b/src/gui/widgets/timeline/timeline-clip-track.hpp
@@ -1,5 +1,5 @@
 /*
-  clip-track.hpp  -  Declaration of the timeline clip track object
+  timeline-clip-track.hpp  -  Declaration of the timeline clip track object
  
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -20,15 +20,15 @@
  
 */
 /**
- * @file widgets/timeline/clip-track.hpp
+ * @file widgets/timeline/timeline-clip-track.hpp
  * This file contains the definition of timeline track objects which
  * contain clips.
  */
 
-#ifndef CLIP_TRACK_HPP
-#define CLIP_TRACK_HPP
+#ifndef TIMELINE_CLIP_TRACK_HPP
+#define TIMELINE_CLIP_TRACK_HPP
 
-#include "track.hpp"
+#include "timeline-track.hpp"
 
 namespace gui {
 namespace widgets {
@@ -55,4 +55,4 @@ private:
 }   // namespace widgets
 }   // namespace gui
 
-#endif // CLIP_TRACK_HPP
+#endif // TIMELINE_CLIP_TRACK_HPP
diff --git a/src/gui/widgets/timeline/clip.cpp b/src/gui/widgets/timeline/timeline-clip.cpp
similarity index 91%
rename from src/gui/widgets/timeline/clip.cpp
rename to src/gui/widgets/timeline/timeline-clip.cpp
index 81822682e..a6b6fb124 100644
--- a/src/gui/widgets/timeline/clip.cpp
+++ b/src/gui/widgets/timeline/timeline-clip.cpp
@@ -1,5 +1,5 @@
 /*
-  track.cpp  -  Implementation of the timeline clip object
+  timeline-track.cpp  -  Implementation of the timeline clip object
  
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -20,7 +20,7 @@
  
 * *****************************************************/
 
-#include "clip.hpp"
+#include "timeline-clip.hpp"
 
 namespace gui {
 namespace widgets {
diff --git a/src/gui/widgets/timeline/clip.hpp b/src/gui/widgets/timeline/timeline-clip.hpp
similarity index 84%
rename from src/gui/widgets/timeline/clip.hpp
rename to src/gui/widgets/timeline/timeline-clip.hpp
index 5cf414dd3..359b7551e 100644
--- a/src/gui/widgets/timeline/clip.hpp
+++ b/src/gui/widgets/timeline/timeline-clip.hpp
@@ -1,5 +1,5 @@
 /*
-  clip.hpp  -  Declaration of the timeline clip object
+  timeline-clip.hpp  -  Declaration of the timeline clip object
  
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -19,12 +19,12 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
 */
-/** @file widgets/timeline/clip.hpp
+/** @file widgets/timeline/timeline-clip.hpp
  ** This file contains the definition of timeline clip object
  */
 
-#ifndef CLIP_HPP
-#define CLIP_HPP
+#ifndef TIMELINE_CLIP_HPP
+#define TIMELINE_CLIP_HPP
 
 namespace gui {
 namespace widgets {
@@ -42,4 +42,4 @@ public:
 }   // namespace widgets
 }   // namespace gui
 
-#endif // CLIP_HPP
+#endif // TIMELINE_CLIP_HPP
diff --git a/src/gui/widgets/timeline/group-track.cpp b/src/gui/widgets/timeline/timeline-group-track.cpp
similarity index 92%
rename from src/gui/widgets/timeline/group-track.cpp
rename to src/gui/widgets/timeline/timeline-group-track.cpp
index ae48351ba..0439ad536 100644
--- a/src/gui/widgets/timeline/group-track.cpp
+++ b/src/gui/widgets/timeline/timeline-group-track.cpp
@@ -1,5 +1,5 @@
 /*
-  group-track.cpp  -  Implementation of the timeline group track object
+  timeline-group-track.cpp  -  Implementation of the timeline group track object
  
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -20,7 +20,7 @@
  
 * *****************************************************/
 
-#include "group-track.hpp"
+#include "timeline-group-track.hpp"
 
 using namespace Gtk;
 
diff --git a/src/gui/widgets/timeline/group-track.hpp b/src/gui/widgets/timeline/timeline-group-track.hpp
similarity index 83%
rename from src/gui/widgets/timeline/group-track.hpp
rename to src/gui/widgets/timeline/timeline-group-track.hpp
index 875584aa8..a354f8a5e 100644
--- a/src/gui/widgets/timeline/group-track.hpp
+++ b/src/gui/widgets/timeline/timeline-group-track.hpp
@@ -1,5 +1,5 @@
 /*
-  group-track.hpp  -  Declaration of the timeline group track object
+  timeline-group-track.hpp  -  Declaration of the timeline group track object
  
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -19,14 +19,14 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
 */
-/** @file widgets/timeline/group-track.hpp
+/** @file widgets/timeline/timeline-group-track.hpp
  ** This file contains the definition of group track timeline objects
  */
 
-#ifndef GROUP_TRACK_HPP
-#define GROUP_TRACK_HPP
+#ifndef TIMELINE_GROUP_TRACK_HPP
+#define TIMELINE_GROUP_TRACK_HPP
 
-#include "track.hpp"
+#include "timeline-track.hpp"
 
 namespace gui {
 namespace widgets {
@@ -54,4 +54,4 @@ private:
 }   // namespace widgets
 }   // namespace gui
 
-#endif // GROUP_TRACK_HPP
+#endif // TIMELINE_GROUP_TRACK_HPP
diff --git a/src/gui/widgets/timeline/timeline-header-container.cpp b/src/gui/widgets/timeline/timeline-header-container.cpp
index 0e88a5dc5..da2ba6f11 100644
--- a/src/gui/widgets/timeline/timeline-header-container.cpp
+++ b/src/gui/widgets/timeline/timeline-header-container.cpp
@@ -24,7 +24,7 @@
 #include <boost/foreach.hpp>
 
 #include "timeline-header-container.hpp"
-#include "track.hpp"
+#include "timeline-track.hpp"
 #include "../timeline-widget.hpp"
 
 using namespace Gtk;
diff --git a/src/gui/widgets/timeline/track.cpp b/src/gui/widgets/timeline/timeline-track.cpp
similarity index 95%
rename from src/gui/widgets/timeline/track.cpp
rename to src/gui/widgets/timeline/timeline-track.cpp
index f220b5bca..3c3a9f9dd 100644
--- a/src/gui/widgets/timeline/track.cpp
+++ b/src/gui/widgets/timeline/timeline-track.cpp
@@ -1,5 +1,5 @@
 /*
-  track.cpp  -  Implementation of the timeline track object
+  timeline-track.cpp  -  Implementation of the timeline track object
  
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -20,7 +20,7 @@
  
 * *****************************************************/
 
-#include "track.hpp"
+#include "timeline-track.hpp"
 #include "../../window-manager.hpp"
 
 using namespace Gtk;
diff --git a/src/gui/widgets/timeline/track.hpp b/src/gui/widgets/timeline/timeline-track.hpp
similarity index 89%
rename from src/gui/widgets/timeline/track.hpp
rename to src/gui/widgets/timeline/timeline-track.hpp
index 25075d972..d0b0148aa 100644
--- a/src/gui/widgets/timeline/track.hpp
+++ b/src/gui/widgets/timeline/timeline-track.hpp
@@ -1,5 +1,5 @@
 /*
-  track.hpp  -  Declaration of the timeline group track object
+  timeline-track.hpp  -  Declaration of the timeline group track object
  
   Copyright (C)         Lumiera.org
     2008,               Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -19,12 +19,12 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
 */
-/** @file widgets/timeline/track.hpp
+/** @file widgets/timeline/timeline-track.hpp
  ** This file contains the definition of timeline track object
  */
 
-#ifndef TRACK_HPP
-#define TRACK_HPP
+#ifndef TIMELINE_TRACK_HPP
+#define TIMELINE_TRACK_HPP
 
 #include "../../gtk-lumiera.hpp"
 
@@ -80,4 +80,4 @@ private:
 }   // namespace widgets
 }   // namespace gui
 
-#endif // TRACK_HPP
+#endif // TIMELINE_TRACK_HPP