diff --git a/plugins/PrivateGroup/PrivateGroupPlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
similarity index 98%
rename from plugins/PrivateGroup/PrivateGroupPlugin.php
rename to plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index 6ead6965ec..9707c08107 100644
--- a/plugins/PrivateGroup/PrivateGroupPlugin.php
+++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
@@ -47,7 +47,7 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class PrivateGroupPlugin extends Plugin
+class GroupPrivateMessagePlugin extends Plugin
 {
     /**
      * Database schema setup
@@ -380,10 +380,10 @@ class PrivateGroupPlugin extends Plugin
  
     function onPluginVersion(&$versions)
     {
-        $versions[] = array('name' => 'PrivateGroup',
+        $versions[] = array('name' => 'GroupPrivateMessage',
                             'version' => STATUSNET_VERSION,
                             'author' => 'Evan Prodromou',
-                            'homepage' => 'http://status.net/wiki/Plugin:PrivateGroup',
+                            'homepage' => 'http://status.net/wiki/Plugin:GroupPrivateMessage',
                             'rawdescription' =>
                             _m('Allow posting DMs to a group.'));
         return true;
diff --git a/plugins/PrivateGroup/Group_message.php b/plugins/GroupPrivateMessage/Group_message.php
similarity index 100%
rename from plugins/PrivateGroup/Group_message.php
rename to plugins/GroupPrivateMessage/Group_message.php
diff --git a/plugins/PrivateGroup/Group_message_profile.php b/plugins/GroupPrivateMessage/Group_message_profile.php
similarity index 100%
rename from plugins/PrivateGroup/Group_message_profile.php
rename to plugins/GroupPrivateMessage/Group_message_profile.php
diff --git a/plugins/PrivateGroup/Group_privacy_settings.php b/plugins/GroupPrivateMessage/Group_privacy_settings.php
similarity index 100%
rename from plugins/PrivateGroup/Group_privacy_settings.php
rename to plugins/GroupPrivateMessage/Group_privacy_settings.php
diff --git a/plugins/PrivateGroup/groupinbox.php b/plugins/GroupPrivateMessage/groupinbox.php
similarity index 100%
rename from plugins/PrivateGroup/groupinbox.php
rename to plugins/GroupPrivateMessage/groupinbox.php
diff --git a/plugins/PrivateGroup/groupmessagecommand.php b/plugins/GroupPrivateMessage/groupmessagecommand.php
similarity index 100%
rename from plugins/PrivateGroup/groupmessagecommand.php
rename to plugins/GroupPrivateMessage/groupmessagecommand.php
diff --git a/plugins/PrivateGroup/groupmessageform.php b/plugins/GroupPrivateMessage/groupmessageform.php
similarity index 100%
rename from plugins/PrivateGroup/groupmessageform.php
rename to plugins/GroupPrivateMessage/groupmessageform.php
diff --git a/plugins/PrivateGroup/groupmessagelist.php b/plugins/GroupPrivateMessage/groupmessagelist.php
similarity index 100%
rename from plugins/PrivateGroup/groupmessagelist.php
rename to plugins/GroupPrivateMessage/groupmessagelist.php
diff --git a/plugins/PrivateGroup/groupmessagelistitem.php b/plugins/GroupPrivateMessage/groupmessagelistitem.php
similarity index 100%
rename from plugins/PrivateGroup/groupmessagelistitem.php
rename to plugins/GroupPrivateMessage/groupmessagelistitem.php
diff --git a/plugins/PrivateGroup/newgroupmessage.php b/plugins/GroupPrivateMessage/newgroupmessage.php
similarity index 100%
rename from plugins/PrivateGroup/newgroupmessage.php
rename to plugins/GroupPrivateMessage/newgroupmessage.php
diff --git a/plugins/PrivateGroup/showgroupmessage.php b/plugins/GroupPrivateMessage/showgroupmessage.php
similarity index 100%
rename from plugins/PrivateGroup/showgroupmessage.php
rename to plugins/GroupPrivateMessage/showgroupmessage.php