diff --git a/plugins/GNUSocial-DukiDukiSnail/GNUSocial-DukiDukiSnail.php b/plugins/GNUsocialDukiDukiSnail/GNUSocial-DukiDukiSnail.php
similarity index 100%
rename from plugins/GNUSocial-DukiDukiSnail/GNUSocial-DukiDukiSnail.php
rename to plugins/GNUsocialDukiDukiSnail/GNUSocial-DukiDukiSnail.php
diff --git a/plugins/GNUSocial-Events/GNUSocial-Events.php b/plugins/GNUsocialDukiDukiSnail/GNUsocialDukiDukiSnail.php
similarity index 100%
rename from plugins/GNUSocial-Events/GNUSocial-Events.php
rename to plugins/GNUsocialDukiDukiSnail/GNUsocialDukiDukiSnail.php
diff --git a/plugins/GNUSocial-DukiDukiSnail/README b/plugins/GNUsocialDukiDukiSnail/README
similarity index 100%
rename from plugins/GNUSocial-DukiDukiSnail/README
rename to plugins/GNUsocialDukiDukiSnail/README
diff --git a/plugins/GNUSocial-Layout/GNUSocial-Layout.php b/plugins/GNUsocialEvents/GNUSocial-Events.php
similarity index 100%
rename from plugins/GNUSocial-Layout/GNUSocial-Layout.php
rename to plugins/GNUsocialEvents/GNUSocial-Events.php
diff --git a/plugins/GNUSocial-OffTheRecordMessaging/GNUSocial-OffTheRecordMessaging.php b/plugins/GNUsocialEvents/GNUsocialEvents.php
similarity index 100%
rename from plugins/GNUSocial-OffTheRecordMessaging/GNUSocial-OffTheRecordMessaging.php
rename to plugins/GNUsocialEvents/GNUsocialEvents.php
diff --git a/plugins/GNUSocial-Photos/GNUSocial-Photos.php b/plugins/GNUsocialLayout/GNUSocial-Layout.php
similarity index 100%
rename from plugins/GNUSocial-Photos/GNUSocial-Photos.php
rename to plugins/GNUsocialLayout/GNUSocial-Layout.php
diff --git a/plugins/GNUSocial-RelationshipsManager/GNUSocial-RelationshipsManager.php b/plugins/GNUsocialLayout/GNUsocialLayout.php
similarity index 100%
rename from plugins/GNUSocial-RelationshipsManager/GNUSocial-RelationshipsManager.php
rename to plugins/GNUsocialLayout/GNUsocialLayout.php
diff --git a/plugins/GNUSocial-Video/GNUSocial-Video.php b/plugins/GNUsocialOffTheRecordMessaging/GNUSocial-OffTheRecordMessaging.php
similarity index 100%
rename from plugins/GNUSocial-Video/GNUSocial-Video.php
rename to plugins/GNUsocialOffTheRecordMessaging/GNUSocial-OffTheRecordMessaging.php
diff --git a/plugins/GNUsocialOffTheRecordMessaging/GNUsocialOffTheRecordMessaging.php b/plugins/GNUsocialOffTheRecordMessaging/GNUsocialOffTheRecordMessaging.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/GNUsocialPhotos/GNUSocial-Photos.php b/plugins/GNUsocialPhotos/GNUSocial-Photos.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/GNUsocialPhotos/GNusocialPhotos.php b/plugins/GNUsocialPhotos/GNusocialPhotos.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/GNUsocialRelationshipsManager/GNUSocial-RelationshipsManager.php b/plugins/GNUsocialRelationshipsManager/GNUSocial-RelationshipsManager.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/GNUsocialRelationshipsManager/GNUsocialRelationshipsManager.php b/plugins/GNUsocialRelationshipsManager/GNUsocialRelationshipsManager.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/GNUsocialVideo/GNUSocial-Video.php b/plugins/GNUsocialVideo/GNUSocial-Video.php
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/plugins/GNUsocialVideo/GNUsocialVideo.php b/plugins/GNUsocialVideo/GNUsocialVideo.php
new file mode 100644
index 0000000000..e69de29bb2