diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 56212ef3e..34dbb1aca 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -7,7 +7,7 @@ ADD_SUBDIRECTORY(carlabase)
 ADD_SUBDIRECTORY(carlapatchbay)
 ADD_SUBDIRECTORY(carlarack)
 ADD_SUBDIRECTORY(CrossoverEQ)
-ADD_SUBDIRECTORY(delay)
+ADD_SUBDIRECTORY(Delay)
 ADD_SUBDIRECTORY(DualFilter)
 ADD_SUBDIRECTORY(dynamics_processor)
 ADD_SUBDIRECTORY(Eq)
diff --git a/plugins/Delay/CMakeLists.txt b/plugins/Delay/CMakeLists.txt
new file mode 100644
index 000000000..13c9ebb7f
--- /dev/null
+++ b/plugins/Delay/CMakeLists.txt
@@ -0,0 +1,3 @@
+INCLUDE(BuildPlugin)
+
+BUILD_PLUGIN(delay DelayEffect.cpp DelayControls.cpp DelayControlsDialog.cpp Lfo.cpp StereoDelay.cpp MOCFILES DelayControls.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
diff --git a/plugins/delay/delaycontrols.cpp b/plugins/Delay/DelayControls.cpp
similarity index 97%
rename from plugins/delay/delaycontrols.cpp
rename to plugins/Delay/DelayControls.cpp
index fd7aaf240..604fd8e46 100644
--- a/plugins/delay/delaycontrols.cpp
+++ b/plugins/Delay/DelayControls.cpp
@@ -24,8 +24,8 @@
 
 #include <QtXml/QDomElement>
 
-#include "delaycontrols.h"
-#include "delayeffect.h"
+#include "DelayControls.h"
+#include "DelayEffect.h"
 #include "Engine.h"
 #include "Song.h"
 
diff --git a/plugins/delay/delaycontrols.h b/plugins/Delay/DelayControls.h
similarity index 98%
rename from plugins/delay/delaycontrols.h
rename to plugins/Delay/DelayControls.h
index a02758ebb..4e4fb4f75 100644
--- a/plugins/delay/delaycontrols.h
+++ b/plugins/Delay/DelayControls.h
@@ -27,7 +27,7 @@
 
 #include "EffectControls.h"
 #include "Knob.h"
-#include "delaycontrolsdialog.h"
+#include "DelayControlsDialog.h"
 
 
 
diff --git a/plugins/delay/delaycontrolsdialog.cpp b/plugins/Delay/DelayControlsDialog.cpp
similarity index 97%
rename from plugins/delay/delaycontrolsdialog.cpp
rename to plugins/Delay/DelayControlsDialog.cpp
index aae4c0aa4..ed45ec363 100644
--- a/plugins/delay/delaycontrolsdialog.cpp
+++ b/plugins/Delay/DelayControlsDialog.cpp
@@ -22,8 +22,8 @@
  *
  */
 
-#include "delaycontrolsdialog.h"
-#include "delaycontrols.h"
+#include "DelayControlsDialog.h"
+#include "DelayControls.h"
 #include "embed.h"
 #include "TempoSyncKnob.h"
 
diff --git a/plugins/delay/delaycontrolsdialog.h b/plugins/Delay/DelayControlsDialog.h
similarity index 100%
rename from plugins/delay/delaycontrolsdialog.h
rename to plugins/Delay/DelayControlsDialog.h
diff --git a/plugins/delay/delayeffect.cpp b/plugins/Delay/DelayEffect.cpp
similarity index 99%
rename from plugins/delay/delayeffect.cpp
rename to plugins/Delay/DelayEffect.cpp
index 4e5bcd95e..b4d2d0082 100644
--- a/plugins/delay/delayeffect.cpp
+++ b/plugins/Delay/DelayEffect.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "delayeffect.h"
+#include "DelayEffect.h"
 #include "Engine.h"
 #include "embed.cpp"
 
diff --git a/plugins/delay/delayeffect.h b/plugins/Delay/DelayEffect.h
similarity index 95%
rename from plugins/delay/delayeffect.h
rename to plugins/Delay/DelayEffect.h
index 21aa31b5e..f51b08f62 100644
--- a/plugins/delay/delayeffect.h
+++ b/plugins/Delay/DelayEffect.h
@@ -26,9 +26,9 @@
 #define DELAYEFFECT_H
 
 #include "Effect.h"
-#include "delaycontrols.h"
-#include "lfo.h"
-#include "stereodelay.h"
+#include "DelayControls.h"
+#include "Lfo.h"
+#include "StereoDelay.h"
 
 class DelayEffect : public Effect
 {
diff --git a/plugins/delay/lfo.cpp b/plugins/Delay/Lfo.cpp
similarity index 98%
rename from plugins/delay/lfo.cpp
rename to plugins/Delay/Lfo.cpp
index 8936bd186..42809f343 100644
--- a/plugins/delay/lfo.cpp
+++ b/plugins/Delay/Lfo.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "lfo.h"
+#include "Lfo.h"
 #include "lmms_math.h"
 
 
diff --git a/plugins/delay/lfo.h b/plugins/Delay/Lfo.h
similarity index 100%
rename from plugins/delay/lfo.h
rename to plugins/Delay/Lfo.h
diff --git a/plugins/delay/stereodelay.cpp b/plugins/Delay/StereoDelay.cpp
similarity index 98%
rename from plugins/delay/stereodelay.cpp
rename to plugins/Delay/StereoDelay.cpp
index 9bdf29fdb..98f9b95da 100644
--- a/plugins/delay/stereodelay.cpp
+++ b/plugins/Delay/StereoDelay.cpp
@@ -22,7 +22,7 @@
  *
  */
 
-#include "stereodelay.h"
+#include "StereoDelay.h"
 #include <cstdlib>
 #include "lmms_basics.h"
 #include "interpolation.h"
diff --git a/plugins/delay/stereodelay.h b/plugins/Delay/StereoDelay.h
similarity index 100%
rename from plugins/delay/stereodelay.h
rename to plugins/Delay/StereoDelay.h
diff --git a/plugins/delay/artwork.png b/plugins/Delay/artwork.png
similarity index 100%
rename from plugins/delay/artwork.png
rename to plugins/Delay/artwork.png
diff --git a/plugins/delay/logo.png b/plugins/Delay/logo.png
similarity index 100%
rename from plugins/delay/logo.png
rename to plugins/Delay/logo.png
diff --git a/plugins/delay/CMakeLists.txt b/plugins/delay/CMakeLists.txt
deleted file mode 100644
index 0663b9458..000000000
--- a/plugins/delay/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-INCLUDE(BuildPlugin)
-
-BUILD_PLUGIN(delay delayeffect.cpp delaycontrols.cpp delaycontrolsdialog.cpp lfo.cpp stereodelay.cpp MOCFILES delaycontrols.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")