diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index b30409169..a1ad7ef07 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -90,7 +90,7 @@ class PluginHost {
 		foreach ($plugins as $class) {
 			$class = trim($class);
 			$class_file = strtolower(basename($class));
-			$file = dirname(__FILE__)."/../plugins/$class_file/$class_file.php";
+			$file = dirname(__FILE__)."/../plugins/$class_file/init.php";
 
 			if (!isset($this->plugins[$class])) {
 				if (file_exists($file)) require_once $file;
diff --git a/plugins/af_explosm/af_explosm.php b/plugins/af_explosm/init.php
similarity index 100%
rename from plugins/af_explosm/af_explosm.php
rename to plugins/af_explosm/init.php
diff --git a/plugins/af_gocomics/af_gocomics.php b/plugins/af_gocomics/init.php
similarity index 100%
rename from plugins/af_gocomics/af_gocomics.php
rename to plugins/af_gocomics/init.php
diff --git a/plugins/af_pennyarcade/af_pennyarcade.php b/plugins/af_pennyarcade/init.php
similarity index 100%
rename from plugins/af_pennyarcade/af_pennyarcade.php
rename to plugins/af_pennyarcade/init.php
diff --git a/plugins/af_redditimgur/af_redditimgur.php b/plugins/af_redditimgur/init.php
similarity index 100%
rename from plugins/af_redditimgur/af_redditimgur.php
rename to plugins/af_redditimgur/init.php
diff --git a/plugins/auth_imap/auth_imap.php b/plugins/auth_imap/init.php
similarity index 100%
rename from plugins/auth_imap/auth_imap.php
rename to plugins/auth_imap/init.php
diff --git a/plugins/auth_internal/auth_internal.php b/plugins/auth_internal/init.php
similarity index 100%
rename from plugins/auth_internal/auth_internal.php
rename to plugins/auth_internal/init.php
diff --git a/plugins/auth_remote/auth_remote.php b/plugins/auth_remote/init.php
similarity index 100%
rename from plugins/auth_remote/auth_remote.php
rename to plugins/auth_remote/init.php
diff --git a/plugins/digest/digest.php b/plugins/digest/init.php
similarity index 100%
rename from plugins/digest/digest.php
rename to plugins/digest/init.php
diff --git a/plugins/example/example.php b/plugins/example/init.php
similarity index 100%
rename from plugins/example/example.php
rename to plugins/example/init.php
diff --git a/plugins/example_feed/example_feed.php b/plugins/example_feed/init.php
similarity index 100%
rename from plugins/example_feed/example_feed.php
rename to plugins/example_feed/init.php
diff --git a/plugins/example_routing/example_routing.php b/plugins/example_routing/init.php
similarity index 100%
rename from plugins/example_routing/example_routing.php
rename to plugins/example_routing/init.php
diff --git a/plugins/flattr/flattr.php b/plugins/flattr/init.php
similarity index 100%
rename from plugins/flattr/flattr.php
rename to plugins/flattr/init.php
diff --git a/plugins/googleplus/googleplus.php b/plugins/googleplus/init.php
similarity index 100%
rename from plugins/googleplus/googleplus.php
rename to plugins/googleplus/init.php
diff --git a/plugins/identica/identica.php b/plugins/identica/init.php
similarity index 100%
rename from plugins/identica/identica.php
rename to plugins/identica/init.php
diff --git a/plugins/import_export/import_export.php b/plugins/import_export/init.php
similarity index 100%
rename from plugins/import_export/import_export.php
rename to plugins/import_export/init.php
diff --git a/plugins/instances/instances.php b/plugins/instances/init.php
similarity index 100%
rename from plugins/instances/instances.php
rename to plugins/instances/init.php
diff --git a/plugins/mail/mail.php b/plugins/mail/init.php
similarity index 100%
rename from plugins/mail/mail.php
rename to plugins/mail/init.php
diff --git a/plugins/note/note.php b/plugins/note/init.php
similarity index 100%
rename from plugins/note/note.php
rename to plugins/note/init.php
diff --git a/plugins/owncloud/owncloud.php b/plugins/owncloud/init.php
similarity index 100%
rename from plugins/owncloud/owncloud.php
rename to plugins/owncloud/init.php
diff --git a/plugins/pinterest/pinterest.php b/plugins/pinterest/init.php
similarity index 100%
rename from plugins/pinterest/pinterest.php
rename to plugins/pinterest/init.php
diff --git a/plugins/pocket/pocket.php b/plugins/pocket/init.php
similarity index 100%
rename from plugins/pocket/pocket.php
rename to plugins/pocket/init.php
diff --git a/plugins/share/share.php b/plugins/share/init.php
similarity index 100%
rename from plugins/share/share.php
rename to plugins/share/init.php
diff --git a/plugins/swap_jk/swap_jk.php b/plugins/swap_jk/init.php
similarity index 100%
rename from plugins/swap_jk/swap_jk.php
rename to plugins/swap_jk/init.php
diff --git a/plugins/updater/updater.php b/plugins/updater/init.php
similarity index 100%
rename from plugins/updater/updater.php
rename to plugins/updater/init.php