diff --git a/include/caption_menu.h b/include/CaptionMenu.h
similarity index 87%
rename from include/caption_menu.h
rename to include/CaptionMenu.h
index 8f5afb630..9e40d9be5 100644
--- a/include/caption_menu.h
+++ b/include/CaptionMenu.h
@@ -1,5 +1,5 @@
 /*
- * caption_menu.h - context menu with a caption
+ * CaptionMenu.h - context menu with a caption
  *
  * Copyright (c) 2007-2008 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
  *
@@ -33,12 +33,12 @@
 ///
 /// \brief A context menu with a caption
 ///
-class EXPORT captionMenu : public QMenu
+class EXPORT CaptionMenu : public QMenu
 {
 	Q_OBJECT
 public:
-	captionMenu( const QString & _title, QWidget * _parent = 0 );
-	virtual ~captionMenu();
+	CaptionMenu( const QString & _title, QWidget * _parent = 0 );
+	virtual ~CaptionMenu();
 
 	///
 	/// \brief Adds a "Help" action displaying the Menu's parent's WhatsThis
diff --git a/plugins/vibed/nine_button_selector.cpp b/plugins/vibed/nine_button_selector.cpp
index 4fbdbf6c9..2bc9e1463 100644
--- a/plugins/vibed/nine_button_selector.cpp
+++ b/plugins/vibed/nine_button_selector.cpp
@@ -28,7 +28,7 @@
 
 #include <QWhatsThis>
 
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "embed.h"
 
 
@@ -251,7 +251,7 @@ void nineButtonSelector::updateButton( int _new_button )
 
 void nineButtonSelector::contextMenuEvent( QContextMenuEvent * )
 {
-	captionMenu contextMenu( windowTitle(), this );
+	CaptionMenu contextMenu( windowTitle(), this );
 	contextMenu.addHelpAction();
 	contextMenu.exec( QCursor::pos() );
 }
diff --git a/plugins/vibed/vibed.cpp b/plugins/vibed/vibed.cpp
index 3368bebe7..8d08e6acf 100644
--- a/plugins/vibed/vibed.cpp
+++ b/plugins/vibed/vibed.cpp
@@ -32,7 +32,7 @@
 #include "NotePlayHandle.h"
 #include "tooltip.h"
 #include "base64.h"
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "Oscillator.h"
 #include "string_container.h"
 #include "templates.h"
@@ -756,7 +756,7 @@ void vibedView::normalizeClicked()
 void vibedView::contextMenuEvent( QContextMenuEvent * )
 {
 
-	captionMenu contextMenu( model()->displayName(), this );
+	CaptionMenu contextMenu( model()->displayName(), this );
 	contextMenu.addHelpAction();
 	contextMenu.exec( QCursor::pos() );
 
diff --git a/src/gui/LfoControllerDialog.cpp b/src/gui/LfoControllerDialog.cpp
index b1415f73f..693207bd9 100644
--- a/src/gui/LfoControllerDialog.cpp
+++ b/src/gui/LfoControllerDialog.cpp
@@ -29,7 +29,7 @@
 #include <QMdiSubWindow>
 #include <QPainter>
 
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "gui_templates.h"
 #include "embed.h"
 #include "Engine.h"
diff --git a/src/gui/PeakControllerDialog.cpp b/src/gui/PeakControllerDialog.cpp
index f657999ce..add8eb529 100644
--- a/src/gui/PeakControllerDialog.cpp
+++ b/src/gui/PeakControllerDialog.cpp
@@ -30,7 +30,7 @@
 #include <QMdiSubWindow>
 #include <QPainter>
 
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "gui_templates.h"
 #include "embed.h"
 #include "Engine.h"
diff --git a/src/gui/PianoView.cpp b/src/gui/PianoView.cpp
index 9e846d61f..64423c036 100644
--- a/src/gui/PianoView.cpp
+++ b/src/gui/PianoView.cpp
@@ -45,7 +45,7 @@
 
 
 #include "PianoView.h"
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "embed.h"
 #include "Engine.h"
 #include "gui_templates.h"
@@ -419,7 +419,7 @@ void PianoView::contextMenuEvent( QContextMenuEvent * _me )
 		return;
 	}
 
-	captionMenu contextMenu( tr( "Base note" ) );
+	CaptionMenu contextMenu( tr( "Base note" ) );
 	AutomatableModelView amv( m_piano->instrumentTrack()->baseNoteModel(), &contextMenu );
 	amv.addDefaultActions( &contextMenu );
 	contextMenu.exec( QCursor::pos() );
diff --git a/src/gui/widgets/AutomatableButton.cpp b/src/gui/widgets/AutomatableButton.cpp
index 8d1d3390d..7680ac894 100644
--- a/src/gui/widgets/AutomatableButton.cpp
+++ b/src/gui/widgets/AutomatableButton.cpp
@@ -28,7 +28,7 @@
 #include <QCursor>
 #include <QMouseEvent>
 
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "Engine.h"
 #include "embed.h"
 #include "MainWindow.h"
@@ -94,13 +94,13 @@ void AutomatableButton::contextMenuEvent( QContextMenuEvent * _me )
 
 	if ( m_group != NULL )
 	{
-		captionMenu contextMenu( m_group->model()->displayName() );
+		CaptionMenu contextMenu( m_group->model()->displayName() );
 		m_group->addDefaultActions( &contextMenu );
 		contextMenu.exec( QCursor::pos() );
 	}
 	else
 	{
-		captionMenu contextMenu( model()->displayName() );
+		CaptionMenu contextMenu( model()->displayName() );
 		addDefaultActions( &contextMenu );
 		contextMenu.exec( QCursor::pos() );
 	}
diff --git a/src/gui/widgets/AutomatableSlider.cpp b/src/gui/widgets/AutomatableSlider.cpp
index 2e6ba0ac6..6a3d10640 100644
--- a/src/gui/widgets/AutomatableSlider.cpp
+++ b/src/gui/widgets/AutomatableSlider.cpp
@@ -28,7 +28,7 @@
 #include <QCursor>
 #include <QMouseEvent>
 
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "embed.h"
 #include "Engine.h"
 #include "MainWindow.h"
@@ -62,7 +62,7 @@ AutomatableSlider::~AutomatableSlider()
 
 void AutomatableSlider::contextMenuEvent( QContextMenuEvent * _me )
 {
-	captionMenu contextMenu( model()->displayName() );
+	CaptionMenu contextMenu( model()->displayName() );
 	addDefaultActions( &contextMenu );
 	contextMenu.exec( QCursor::pos() );
 }
diff --git a/src/gui/widgets/caption_menu.cpp b/src/gui/widgets/CaptionMenu.cpp
similarity index 87%
rename from src/gui/widgets/caption_menu.cpp
rename to src/gui/widgets/CaptionMenu.cpp
index 2ae6b5a91..7c4deca6b 100644
--- a/src/gui/widgets/caption_menu.cpp
+++ b/src/gui/widgets/CaptionMenu.cpp
@@ -1,5 +1,5 @@
 /*
- * caption_menu.cpp - context menu with a caption
+ * CaptionMenu.cpp - context menu with a caption
  *
  * Copyright (c) 2007 Javier Serrano Polo <jasp00/at/users.sourceforge.net>
  * 
@@ -23,13 +23,13 @@
  */
 
 
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "embed.h"
 
 
 
 
-captionMenu::captionMenu( const QString & _title, QWidget * _parent ) :
+CaptionMenu::CaptionMenu( const QString & _title, QWidget * _parent ) :
 	QMenu( _title, _parent )
 {
 	QAction * caption = addAction( _title );
@@ -39,14 +39,14 @@ captionMenu::captionMenu( const QString & _title, QWidget * _parent ) :
 
 
 
-captionMenu::~captionMenu()
+CaptionMenu::~CaptionMenu()
 {
 }
 
 
 
 
-void captionMenu::addHelpAction()
+void CaptionMenu::addHelpAction()
 {
 	QWidget* parent = (QWidget*) this->parent();
 
diff --git a/src/gui/widgets/ControllerView.cpp b/src/gui/widgets/ControllerView.cpp
index 6dc281935..0be6df17a 100644
--- a/src/gui/widgets/ControllerView.cpp
+++ b/src/gui/widgets/ControllerView.cpp
@@ -34,7 +34,7 @@
 
 #include "ControllerView.h"
 
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "ControllerDialog.h"
 #include "gui_templates.h"
 #include "embed.h"
@@ -176,7 +176,7 @@ void ControllerView::modelChanged()
 
 void ControllerView::contextMenuEvent( QContextMenuEvent * )
 {
-	QPointer<captionMenu> contextMenu = new captionMenu( model()->displayName(), this );
+	QPointer<CaptionMenu> contextMenu = new CaptionMenu( model()->displayName(), this );
 	contextMenu->addAction( embed::getIconPixmap( "cancel" ),
 						tr( "&Remove this plugin" ),
 						this, SLOT( deleteController() ) );
diff --git a/src/gui/widgets/EffectView.cpp b/src/gui/widgets/EffectView.cpp
index 0036667e6..7bf1560fc 100644
--- a/src/gui/widgets/EffectView.cpp
+++ b/src/gui/widgets/EffectView.cpp
@@ -32,7 +32,7 @@
 
 #include "EffectView.h"
 #include "DummyEffect.h"
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "EffectControls.h"
 #include "EffectControlDialog.h"
 #include "embed.h"
@@ -245,7 +245,7 @@ void EffectView::closeEffects()
 
 void EffectView::contextMenuEvent( QContextMenuEvent * )
 {
-	QPointer<captionMenu> contextMenu = new captionMenu( model()->displayName(), this );
+	QPointer<CaptionMenu> contextMenu = new CaptionMenu( model()->displayName(), this );
 	contextMenu->addAction( embed::getIconPixmap( "arp_up" ),
 						tr( "Move &up" ),
 						this, SLOT( moveUp() ) );
diff --git a/src/gui/widgets/FxLine.cpp b/src/gui/widgets/FxLine.cpp
index 0304d3d8e..cc394acd9 100644
--- a/src/gui/widgets/FxLine.cpp
+++ b/src/gui/widgets/FxLine.cpp
@@ -37,7 +37,7 @@
 #include "Engine.h"
 #include "SendButtonIndicator.h"
 #include "gui_templates.h"
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 
 const int FxLine::FxLineHeight = 287;
 QPixmap * FxLine::s_sendBgArrow = NULL;
@@ -183,7 +183,7 @@ void FxLine::mouseDoubleClickEvent( QMouseEvent * )
 void FxLine::contextMenuEvent( QContextMenuEvent * )
 {
 	FxMixer * mix = Engine::fxMixer();
-	QPointer<captionMenu> contextMenu = new captionMenu( mix->effectChannel( m_channelIndex )->m_name, this );
+	QPointer<CaptionMenu> contextMenu = new CaptionMenu( mix->effectChannel( m_channelIndex )->m_name, this );
 	if( m_channelIndex != 0 ) // no move-options in master 
 	{
 		contextMenu->addAction( tr( "Move &left" ),	this, SLOT( moveChannelLeft() ) );
diff --git a/src/gui/widgets/LcdSpinBox.cpp b/src/gui/widgets/LcdSpinBox.cpp
index 4d0eec342..afdf85943 100644
--- a/src/gui/widgets/LcdSpinBox.cpp
+++ b/src/gui/widgets/LcdSpinBox.cpp
@@ -32,7 +32,7 @@
 #include <QInputDialog>
 
 #include "LcdSpinBox.h"
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "Engine.h"
 #include "embed.h"
 #include "gui_templates.h"
@@ -87,7 +87,7 @@ void LcdSpinBox::contextMenuEvent( QContextMenuEvent* event )
 	// an QApplication::restoreOverrideCursor()-call...
 	mouseReleaseEvent( NULL );
 
-	captionMenu contextMenu( model()->displayName() );
+	CaptionMenu contextMenu( model()->displayName() );
 	addDefaultActions( &contextMenu );
 	contextMenu.exec( QCursor::pos() );
 }
diff --git a/src/gui/widgets/combobox.cpp b/src/gui/widgets/combobox.cpp
index 8e857eb0f..18322ad02 100644
--- a/src/gui/widgets/combobox.cpp
+++ b/src/gui/widgets/combobox.cpp
@@ -34,7 +34,7 @@
 #include <QPixmap>
 #include <QStyleOptionFrame>
 
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "Engine.h"
 #include "embed.h"
 #include "gui_templates.h"
@@ -113,7 +113,7 @@ void comboBox::contextMenuEvent( QContextMenuEvent * event )
 		return;
 	}
 
-	captionMenu contextMenu( model()->displayName() );
+	CaptionMenu contextMenu( model()->displayName() );
 	addDefaultActions( &contextMenu );
 	contextMenu.exec( QCursor::pos() );
 }
diff --git a/src/gui/widgets/fader.cpp b/src/gui/widgets/fader.cpp
index 38d6fcbe8..69c2b023d 100644
--- a/src/gui/widgets/fader.cpp
+++ b/src/gui/widgets/fader.cpp
@@ -53,7 +53,7 @@
 #include "fader.h"
 #include "embed.h"
 #include "Engine.h"
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "ConfigManager.h"
 #include "text_float.h"
 #include "MainWindow.h"
@@ -115,7 +115,7 @@ fader::~fader()
 
 void fader::contextMenuEvent( QContextMenuEvent * _ev )
 {
-	captionMenu contextMenu( windowTitle() );
+	CaptionMenu contextMenu( windowTitle() );
 	addDefaultActions( &contextMenu );
 	contextMenu.exec( QCursor::pos() );
 	_ev->accept();
diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp
index 941a77f13..8fda84463 100644
--- a/src/gui/widgets/knob.cpp
+++ b/src/gui/widgets/knob.cpp
@@ -37,7 +37,7 @@
 
 #include "lmms_math.h"
 #include "knob.h"
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "ConfigManager.h"
 #include "ControllerConnection.h"
 #include "embed.h"
@@ -481,7 +481,7 @@ void knob::contextMenuEvent( QContextMenuEvent * )
 	// an QApplication::restoreOverrideCursor()-call...
 	mouseReleaseEvent( NULL );
 
-	captionMenu contextMenu( model()->displayName(), this );
+	CaptionMenu contextMenu( model()->displayName(), this );
 	addDefaultActions( &contextMenu );
 	contextMenu.addAction( QPixmap(), 
 		model()->isScaleLogarithmic() ? tr( "Set linear" ) : tr( "Set logarithmic" ),
diff --git a/src/gui/widgets/tempo_sync_knob.cpp b/src/gui/widgets/tempo_sync_knob.cpp
index 21149592a..b08961421 100644
--- a/src/gui/widgets/tempo_sync_knob.cpp
+++ b/src/gui/widgets/tempo_sync_knob.cpp
@@ -28,7 +28,7 @@
 
 #include "TempoSyncKnob.h"
 #include "Engine.h"
-#include "caption_menu.h"
+#include "CaptionMenu.h"
 #include "embed.h"
 #include "MainWindow.h"
 #include "MeterDialog.h"
@@ -83,7 +83,7 @@ void TempoSyncKnob::contextMenuEvent( QContextMenuEvent * )
 {
 	mouseReleaseEvent( NULL );
 
-	captionMenu contextMenu( model()->displayName(), this );
+	CaptionMenu contextMenu( model()->displayName(), this );
 	addDefaultActions( &contextMenu );
 	contextMenu.addSeparator();