diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp
index 26bbdfd6b..5f564dd90 100644
--- a/src/gui/panels/timeline-panel.cpp
+++ b/src/gui/panels/timeline-panel.cpp
@@ -92,14 +92,14 @@ TimelinePanel::TimelinePanel(workspace::PanelManager &panel_manager,
   toolbar.append(forwardButton);
   toolbar.append(nextButton);
   
-  toolbar.append(seperator1);
+  toolbar.append(separator1);
   
   toolbar.append(arrowTool,
     mem_fun(this, &TimelinePanel::on_arrow_tool));
   toolbar.append(iBeamTool,
     mem_fun(this, &TimelinePanel::on_ibeam_tool));
     
-  toolbar.append(seperator2);
+  toolbar.append(separator2);
   
   toolbar.append(zoomIn, mem_fun(this, &TimelinePanel::on_zoom_in));
   toolbar.append(zoomOut, mem_fun(this, &TimelinePanel::on_zoom_out));
diff --git a/src/gui/panels/timeline-panel.hpp b/src/gui/panels/timeline-panel.hpp
index 8b209b3ff..75df50cd5 100644
--- a/src/gui/panels/timeline-panel.hpp
+++ b/src/gui/panels/timeline-panel.hpp
@@ -181,12 +181,12 @@ private:
   MiniToggleButton arrowTool;
   MiniToggleButton iBeamTool;
   
-  Gtk::SeparatorToolItem seperator1;
+  Gtk::SeparatorToolItem separator1;
   
   MiniButton zoomIn;
   MiniButton zoomOut;
   
-  Gtk::SeparatorToolItem seperator2;
+  Gtk::SeparatorToolItem separator2;
     
   // Internals
   bool updatingToolbar;
diff --git a/src/gui/widgets/timeline/timeline-clip.cpp b/src/gui/widgets/timeline/timeline-clip.cpp
index dc93ccbb5..d41a473ca 100644
--- a/src/gui/widgets/timeline/timeline-clip.cpp
+++ b/src/gui/widgets/timeline/timeline-clip.cpp
@@ -66,7 +66,7 @@ Clip::draw_clip(Cairo::RefPtr<Cairo::Context> cr,
                                Cairo::FONT_WEIGHT_NORMAL);
   cr->set_font_face(font);
   cr->set_font_size(11);
-  cr->show_text("Track");  // TODO: get clip name from model
+  cr->show_text("Clip Name");  // TODO: get clip name from model
 
   // TODO: Show thumbnails for clip
 }