diff --git a/include/automatable_slider.h b/include/AutomatableSlider.h
similarity index 87%
rename from include/automatable_slider.h
rename to include/AutomatableSlider.h
index aac331750..1cd1405b1 100644
--- a/include/automatable_slider.h
+++ b/include/AutomatableSlider.h
@@ -1,5 +1,5 @@
 /*
- * automatable_slider.h - class automatableSlider, a QSlider with automation
+ * AutomatableSlider.h - class automatableSlider, a QSlider with automation
  *
  * Copyright (c) 2006-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
  *
@@ -32,12 +32,12 @@
 
 
 
-class automatableSlider : public QSlider, public IntModelView
+class AutomatableSlider : public QSlider, public IntModelView
 {
 	Q_OBJECT
 public:
-	automatableSlider( QWidget * _parent, const QString & _name = QString::null );
-	virtual ~automatableSlider();
+	AutomatableSlider( QWidget * _parent, const QString & _name = QString::null );
+	virtual ~AutomatableSlider();
 
 	bool showStatus()
 	{
diff --git a/include/SongEditor.h b/include/SongEditor.h
index b1651bc01..5d876591b 100644
--- a/include/SongEditor.h
+++ b/include/SongEditor.h
@@ -32,7 +32,7 @@
 class QLabel;
 class QScrollBar;
 
-class automatableSlider;
+class AutomatableSlider;
 class comboBox;
 class LcdSpinBox;
 class MeterDialog;
@@ -113,8 +113,8 @@ private:
 	Timeline * m_timeLine;
 
 	MeterDialog * m_timeSigDisplay;
-	automatableSlider * m_masterVolumeSlider;
-	automatableSlider * m_masterPitchSlider;
+	AutomatableSlider * m_masterVolumeSlider;
+	AutomatableSlider * m_masterPitchSlider;
 
 	textFloat * m_mvsStatus;
 	textFloat * m_mpsStatus;
diff --git a/src/gui/SongEditor.cpp b/src/gui/SongEditor.cpp
index 4755afb64..9135cec1f 100644
--- a/src/gui/SongEditor.cpp
+++ b/src/gui/SongEditor.cpp
@@ -36,7 +36,7 @@
 #include <math.h>
 
 #include "SongEditor.h"
-#include "automatable_slider.h"
+#include "AutomatableSlider.h"
 #include "combobox.h"
 #include "ConfigManager.h"
 #include "cpuload_widget.h"
@@ -154,7 +154,7 @@ SongEditor::SongEditor( Song * _song ) :
 	QLabel * master_vol_lbl = new QLabel( tb );
 	master_vol_lbl->setPixmap( embed::getIconPixmap( "master_volume" ) );
 
-	m_masterVolumeSlider = new automatableSlider( tb,
+	m_masterVolumeSlider = new AutomatableSlider( tb,
 							tr( "Master volume" ) );
 	m_masterVolumeSlider->setModel( &m_song->m_masterVolumeModel );
 	m_masterVolumeSlider->setOrientation( Qt::Vertical );
@@ -188,7 +188,7 @@ SongEditor::SongEditor( Song * _song ) :
 	master_pitch_lbl->setPixmap( embed::getIconPixmap( "master_pitch" ) );
 	master_pitch_lbl->setFixedHeight( 64 );
 
-	m_masterPitchSlider = new automatableSlider( tb, tr( "Master pitch" ) );
+	m_masterPitchSlider = new AutomatableSlider( tb, tr( "Master pitch" ) );
 	m_masterPitchSlider->setModel( &m_song->m_masterPitchModel );
 	m_masterPitchSlider->setOrientation( Qt::Vertical );
 	m_masterPitchSlider->setPageStep( 1 );
diff --git a/src/gui/widgets/automatable_slider.cpp b/src/gui/widgets/AutomatableSlider.cpp
similarity index 79%
rename from src/gui/widgets/automatable_slider.cpp
rename to src/gui/widgets/AutomatableSlider.cpp
index b604ce757..2e6ba0ac6 100644
--- a/src/gui/widgets/automatable_slider.cpp
+++ b/src/gui/widgets/AutomatableSlider.cpp
@@ -1,5 +1,5 @@
 /*
- * automatable_slider.cpp - implementation of class automatableSlider
+ * AutomatableSlider.cpp - implementation of class automatableSlider
  *
  * Copyright (c) 2006-2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
  * Copyright (c) 2007-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
@@ -23,7 +23,7 @@
  *
  */
 
-#include "automatable_slider.h"
+#include "AutomatableSlider.h"
 
 #include <QCursor>
 #include <QMouseEvent>
@@ -36,7 +36,7 @@
 
 
 
-automatableSlider::automatableSlider( QWidget * _parent,
+AutomatableSlider::AutomatableSlider( QWidget * _parent,
 						const QString & _name ) :
 	QSlider( _parent ),
 	IntModelView( new IntModel( 0, 0, 0, NULL, _name, true ), this ),
@@ -53,14 +53,14 @@ automatableSlider::automatableSlider( QWidget * _parent,
 
 
 
-automatableSlider::~automatableSlider()
+AutomatableSlider::~AutomatableSlider()
 {
 }
 
 
 
 
-void automatableSlider::contextMenuEvent( QContextMenuEvent * _me )
+void AutomatableSlider::contextMenuEvent( QContextMenuEvent * _me )
 {
 	captionMenu contextMenu( model()->displayName() );
 	addDefaultActions( &contextMenu );
@@ -70,7 +70,7 @@ void automatableSlider::contextMenuEvent( QContextMenuEvent * _me )
 
 
 
-void automatableSlider::mousePressEvent( QMouseEvent * _me )
+void AutomatableSlider::mousePressEvent( QMouseEvent * _me )
 {
 	if( _me->button() == Qt::LeftButton &&
 	   ! ( _me->modifiers() & Qt::ControlModifier ) )
@@ -87,7 +87,7 @@ void automatableSlider::mousePressEvent( QMouseEvent * _me )
 
 
 
-void automatableSlider::mouseReleaseEvent( QMouseEvent * _me )
+void AutomatableSlider::mouseReleaseEvent( QMouseEvent * _me )
 {
 	m_showStatus = false;
 	QSlider::mouseReleaseEvent( _me );
@@ -96,7 +96,7 @@ void automatableSlider::mouseReleaseEvent( QMouseEvent * _me )
 
 
 
-void automatableSlider::wheelEvent( QWheelEvent * _me )
+void AutomatableSlider::wheelEvent( QWheelEvent * _me )
 {
 	bool old_status = m_showStatus;
 	m_showStatus = true;
@@ -107,7 +107,7 @@ void automatableSlider::wheelEvent( QWheelEvent * _me )
 
 
 
-void automatableSlider::modelChanged()
+void AutomatableSlider::modelChanged()
 {
 	QSlider::setRange( model()->minValue(), model()->maxValue() );
 	updateSlider();
@@ -118,7 +118,7 @@ void automatableSlider::modelChanged()
 
 
 
-void automatableSlider::changeValue( int _value )
+void AutomatableSlider::changeValue( int _value )
 {
 	model()->setValue( _value );
 	emit logicValueChanged( model()->value() );
@@ -127,7 +127,7 @@ void automatableSlider::changeValue( int _value )
 
 
 
-void automatableSlider::moveSlider( int _value )
+void AutomatableSlider::moveSlider( int _value )
 {
 	model()->setValue( _value );
 	emit logicSliderMoved( model()->value() );
@@ -136,7 +136,7 @@ void automatableSlider::moveSlider( int _value )
 
 
 
-void automatableSlider::updateSlider()
+void AutomatableSlider::updateSlider()
 {
 	QSlider::setValue( model()->value() );
 }