diff --git a/plugins/deviceplugins/deviceplugins.pro b/plugins/deviceplugins/deviceplugins.pro
index 475c4c9c..489e1875 100644
--- a/plugins/deviceplugins/deviceplugins.pro
+++ b/plugins/deviceplugins/deviceplugins.pro
@@ -1,3 +1,6 @@
 TEMPLATE = subdirs
-SUBDIRS += devicepluginelro devicepluginintertechno devicepluginmeisteranker devicepluginwifidetector
+SUBDIRS += elro \
+    intertechno \
+    meisteranker \
+    wifidetector \
 
diff --git a/plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp b/plugins/deviceplugins/elro/devicepluginelro.cpp
similarity index 100%
rename from plugins/deviceplugins/devicepluginelro/devicepluginelro.cpp
rename to plugins/deviceplugins/elro/devicepluginelro.cpp
diff --git a/plugins/deviceplugins/devicepluginelro/devicepluginelro.h b/plugins/deviceplugins/elro/devicepluginelro.h
similarity index 100%
rename from plugins/deviceplugins/devicepluginelro/devicepluginelro.h
rename to plugins/deviceplugins/elro/devicepluginelro.h
diff --git a/plugins/deviceplugins/devicepluginelro/devicepluginelro.json b/plugins/deviceplugins/elro/devicepluginelro.json
similarity index 100%
rename from plugins/deviceplugins/devicepluginelro/devicepluginelro.json
rename to plugins/deviceplugins/elro/devicepluginelro.json
diff --git a/plugins/deviceplugins/devicepluginelro/devicepluginelro.pro b/plugins/deviceplugins/elro/elro.pro
similarity index 100%
rename from plugins/deviceplugins/devicepluginelro/devicepluginelro.pro
rename to plugins/deviceplugins/elro/elro.pro
diff --git a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp b/plugins/deviceplugins/intertechno/devicepluginintertechno.cpp
similarity index 100%
rename from plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.cpp
rename to plugins/deviceplugins/intertechno/devicepluginintertechno.cpp
diff --git a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.h b/plugins/deviceplugins/intertechno/devicepluginintertechno.h
similarity index 100%
rename from plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.h
rename to plugins/deviceplugins/intertechno/devicepluginintertechno.h
diff --git a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.json b/plugins/deviceplugins/intertechno/devicepluginintertechno.json
similarity index 100%
rename from plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.json
rename to plugins/deviceplugins/intertechno/devicepluginintertechno.json
diff --git a/plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro b/plugins/deviceplugins/intertechno/intertechno.pro
similarity index 100%
rename from plugins/deviceplugins/devicepluginintertechno/devicepluginintertechno.pro
rename to plugins/deviceplugins/intertechno/intertechno.pro
diff --git a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.cpp b/plugins/deviceplugins/meisteranker/devicepluginmeisteranker.cpp
similarity index 100%
rename from plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.cpp
rename to plugins/deviceplugins/meisteranker/devicepluginmeisteranker.cpp
diff --git a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.h b/plugins/deviceplugins/meisteranker/devicepluginmeisteranker.h
similarity index 100%
rename from plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.h
rename to plugins/deviceplugins/meisteranker/devicepluginmeisteranker.h
diff --git a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.json b/plugins/deviceplugins/meisteranker/devicepluginmeisteranker.json
similarity index 100%
rename from plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.json
rename to plugins/deviceplugins/meisteranker/devicepluginmeisteranker.json
diff --git a/plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.pro b/plugins/deviceplugins/meisteranker/meisteranker.pro
similarity index 100%
rename from plugins/deviceplugins/devicepluginmeisteranker/devicepluginmeisteranker.pro
rename to plugins/deviceplugins/meisteranker/meisteranker.pro
diff --git a/plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.cpp b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.cpp
similarity index 100%
rename from plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.cpp
rename to plugins/deviceplugins/wifidetector/devicepluginwifidetector.cpp
diff --git a/plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.h b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.h
similarity index 100%
rename from plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.h
rename to plugins/deviceplugins/wifidetector/devicepluginwifidetector.h
diff --git a/plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.json b/plugins/deviceplugins/wifidetector/devicepluginwifidetector.json
similarity index 100%
rename from plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.json
rename to plugins/deviceplugins/wifidetector/devicepluginwifidetector.json
diff --git a/plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.pro b/plugins/deviceplugins/wifidetector/wifidetector.pro
similarity index 100%
rename from plugins/deviceplugins/devicepluginwifidetector/devicepluginwifidetector.pro
rename to plugins/deviceplugins/wifidetector/wifidetector.pro
diff --git a/server/server.pro b/server/server.pro
index 2a00299d..3cb335d7 100644
--- a/server/server.pro
+++ b/server/server.pro
@@ -25,7 +25,7 @@ HEADERS += hivecore.h \
            rule.h
 
 # FIXME: Drop this and link them dynamically
-LIBS += -L../plugins/deviceplugins/devicepluginelro/ -lhive_devicepluginelro
-LIBS += -L../plugins/deviceplugins/devicepluginintertechno/ -lhive_devicepluginintertechno
-LIBS += -L../plugins/deviceplugins/devicepluginmeisteranker/ -lhive_devicepluginmeisteranker
-LIBS += -L../plugins/deviceplugins/devicepluginwifidetector/ -lhive_devicepluginwifidetector
+LIBS += -L../plugins/deviceplugins/elro/ -lhive_devicepluginelro
+LIBS += -L../plugins/deviceplugins/intertechno/ -lhive_devicepluginintertechno
+LIBS += -L../plugins/deviceplugins/meisteranker/ -lhive_devicepluginmeisteranker
+LIBS += -L../plugins/deviceplugins/wifidetector/ -lhive_devicepluginwifidetector