diff --git a/aqt/groupsel.py b/aqt/groupman.py
similarity index 97%
rename from aqt/groupsel.py
rename to aqt/groupman.py
index 61bcc6e74..4de43ad57 100644
--- a/aqt/groupsel.py
+++ b/aqt/groupman.py
@@ -14,11 +14,11 @@ COLDUE = 3
 COLNEW = 4
 GREY = "#777"
 
-class GroupSel(QDialog):
+class GroupManager(QDialog):
     def __init__(self, mw):
         QDialog.__init__(self, mw)
         self.mw = mw
-        self.form = aqt.forms.groupsel.Ui_Dialog()
+        self.form = aqt.forms.groupman.Ui_Dialog()
         self.form.setupUi(self)
         self.loadTable()
         self.addButtons()
@@ -59,7 +59,7 @@ class GroupSel(QDialog):
         self.connect(box,
                      SIGNAL("helpRequested()"),
                      lambda: QDesktopServices.openUrl(QUrl(
-                         aqt.appWiki + "GroupSelection")))
+                         aqt.appWiki + "GroupManager")))
 
     def onStudy(self):
         self.mw.deck.reset()
diff --git a/aqt/overview.py b/aqt/overview.py
index 0c2c07de2..e4c589727 100644
--- a/aqt/overview.py
+++ b/aqt/overview.py
@@ -177,5 +177,5 @@ $(function () {
     ##########################################################################
 
     def changeGroups(self):
-        from aqt.groupsel import GroupSel
-        g = GroupSel(self.mw)
+        from aqt.groupman import GroupManager
+        g = GroupManager(self.mw)
diff --git a/designer/groupsel.ui b/designer/groupman.ui
similarity index 98%
rename from designer/groupsel.ui
rename to designer/groupman.ui
index 7a92b1fec..303f73c1d 100644
--- a/designer/groupsel.ui
+++ b/designer/groupman.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Select Groups</string>
+   <string>Groups</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>