diff --git a/config/settings/espeak.settings.conf b/config/settings/espeak.settings.conf
index 0b43b53c..aa356cd0 100644
--- a/config/settings/espeak.settings.conf
+++ b/config/settings/espeak.settings.conf
@@ -4,7 +4,7 @@ enabled=True
 
 # Select the driver used to play sounds, choices are generic and gstreamer.
 # Sox is the default.
-driver=generic
+driver=genericDriver
 
 # Sound themes. This is the pack of sounds used for sound alerts.
 # Sound packs may be located at /usr/share/sounds
@@ -32,8 +32,8 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine
 enabled=True
 
 # Select speech driver, options are speechd (default) or espeak:
-#driver=speechd
-driver=espeak
+#driver=speechdDriver
+driver=espeakDriver
 
 
 # The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
@@ -65,7 +65,7 @@ autoReadIncoming=True
 [braille]
 #braille is not implemented yet
 enabled=False
-driver=brlapi
+driver=brlapiDriver
 layout=en
 
 [screen]
@@ -76,7 +76,7 @@ suspendingScreen=
 autodetectSuspendingScreen=True
 
 [keyboard]
-driver=evdev
+driver=evdevDriver
 # filter input devices NOMICE, ALL or a DEVICE NAME
 device=ALL
 # gives fenrir exclusive access to the keyboard and let consume keystrokes.
diff --git a/config/settings/settings.conf b/config/settings/settings.conf
index 019fff66..c0abfe54 100644
--- a/config/settings/settings.conf
+++ b/config/settings/settings.conf
@@ -4,8 +4,8 @@ enabled=True
 
 # Select the driver used to play sounds, choices are generic and gstreamer.
 # Sox is the default.
-#driver=gstreamer
-driver=generic
+#driver=gstreamerDriver
+driver=genericDriver
 
 # Sound themes. This is the pack of sounds used for sound alerts.
 # Sound packs may be located at /usr/share/sounds
@@ -33,8 +33,8 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine
 enabled=True
 
 # Select speech driver, options are speechd (default) or espeak:
-driver=speechd
-#driver=espeak
+driver=speechdDriver
+#driver=espeakDriver
 
 
 # The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
@@ -66,18 +66,18 @@ autoReadIncoming=True
 [braille]
 #braille is not implemented yet
 enabled=False
-driver=brlapi
+driver=brlapiDriver
 layout=en
 
 [screen]
-driver=vcsa
+driver=vcsaDriver
 encoding=cp850
 screenUpdateDelay=0.05
 suspendingScreen=
 autodetectSuspendingScreen=True
 
 [keyboard]
-driver=evdev
+driver=evdevDriver
 # filter input devices NOMICE, ALL or a DEVICE NAME
 device=ALL
 # gives fenrir exclusive access to the keyboard and let consume keystrokes.
diff --git a/config/settings/settings.conf.chrys b/config/settings/settings.conf.chrys
index a9c76780..641906e8 100644
--- a/config/settings/settings.conf.chrys
+++ b/config/settings/settings.conf.chrys
@@ -4,7 +4,7 @@ enabled=True
 
 # Select the driver used to play sounds, choices are generic and gstreamer.
 # Sox is the default.
-driver=generic
+driver=genericDriver
 
 # Sound themes. This is the pack of sounds used for sound alerts.
 # Sound packs may be located at /usr/share/sounds
@@ -32,8 +32,8 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine
 enabled=True
 
 # Select speech driver, options are speechd (default) or espeak:
-driver=speechd
-#driver=espeak
+driver=speechdDriver
+#driver=espeakDriver
 
 
 # The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
@@ -65,18 +65,18 @@ autoReadIncoming=True
 [braille]
 #braille is not implemented yet
 enabled=True
-driver=brlapi
+driver=brlapiDriver
 layout=en
 
 [screen]
-driver=vcsa
+driver=vcsaDriver
 encoding=cp850
 screenUpdateDelay=0.05
 suspendingScreen=
 autodetectSuspendingScreen=True
 
 [keyboard]
-driver=evdev
+driver=evdevDriver
 # filter input devices NOMICE, ALL or a DEVICE NAME
 device=ALL
 # gives fenrir exclusive access to the keyboard and let consume keystrokes. just disable on problems.
diff --git a/config/settings/settings.conf.storm b/config/settings/settings.conf.storm
index 6f4f2e42..3cdc66ee 100644
--- a/config/settings/settings.conf.storm
+++ b/config/settings/settings.conf.storm
@@ -1,6 +1,6 @@
 [sound]
 enabled=True
-driver=generic
+driver=genericDriver
 theme=default
 volume=1.0
 # shell commands for generic sound driver
@@ -9,7 +9,7 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine
 
 [speech]
 enabled=True
-driver=speechd
+driver=speechdDriver
 rate=0.85
 pitch=0.5
 # Pitch for capital letters
@@ -22,7 +22,7 @@ autoReadIncoming=True
 
 [braille]
 enabled=False
-driver=brlapi
+driver=brlapiDriver
 layout=en
 
 [screen]
@@ -33,7 +33,7 @@ suspendingScreen=7
 autodetectSuspendingScreen=False
 
 [keyboard]
-driver=evdev
+driver=evdevDriver
 # filter input devices NOMICE, ALL or a DEVICE NAME
 device=ALL
 grabDevices=True
diff --git a/src/fenrir/brailleDriver/brlapi.py b/src/fenrir/brailleDriver/brlapiDriver.py
similarity index 100%
rename from src/fenrir/brailleDriver/brlapi.py
rename to src/fenrir/brailleDriver/brlapiDriver.py
diff --git a/src/fenrir/inputDriver/dummy.py b/src/fenrir/inputDriver/dummyDriver.py
similarity index 100%
rename from src/fenrir/inputDriver/dummy.py
rename to src/fenrir/inputDriver/dummyDriver.py
diff --git a/src/fenrir/inputDriver/evdev.py b/src/fenrir/inputDriver/evdevDriver.py
similarity index 100%
rename from src/fenrir/inputDriver/evdev.py
rename to src/fenrir/inputDriver/evdevDriver.py
diff --git a/src/fenrir/screenDriver/vcsa.py b/src/fenrir/screenDriver/vcsaDriver.py
similarity index 100%
rename from src/fenrir/screenDriver/vcsa.py
rename to src/fenrir/screenDriver/vcsaDriver.py
diff --git a/src/fenrir/soundDriver/dummy.py b/src/fenrir/soundDriver/dummyDriver.py
similarity index 100%
rename from src/fenrir/soundDriver/dummy.py
rename to src/fenrir/soundDriver/dummyDriver.py
diff --git a/src/fenrir/soundDriver/generic.py b/src/fenrir/soundDriver/genericDriver.py
similarity index 100%
rename from src/fenrir/soundDriver/generic.py
rename to src/fenrir/soundDriver/genericDriver.py
diff --git a/src/fenrir/soundDriver/gstreamer.py b/src/fenrir/soundDriver/gstreamerDriver.py
similarity index 100%
rename from src/fenrir/soundDriver/gstreamer.py
rename to src/fenrir/soundDriver/gstreamerDriver.py
diff --git a/src/fenrir/speechDriver/dummy.py b/src/fenrir/speechDriver/dummyDriver.py
similarity index 100%
rename from src/fenrir/speechDriver/dummy.py
rename to src/fenrir/speechDriver/dummyDriver.py
diff --git a/src/fenrir/speechDriver/espeak.py b/src/fenrir/speechDriver/espeakDriver.py
similarity index 100%
rename from src/fenrir/speechDriver/espeak.py
rename to src/fenrir/speechDriver/espeakDriver.py
diff --git a/src/fenrir/speechDriver/speechd.py b/src/fenrir/speechDriver/speechdDriver.py
similarity index 100%
rename from src/fenrir/speechDriver/speechd.py
rename to src/fenrir/speechDriver/speechdDriver.py