diff --git a/bin/gaps_server.rb b/bin/gaps_server.rb
index 6c7f509..2256327 100755
--- a/bin/gaps_server.rb
+++ b/bin/gaps_server.rb
@@ -267,14 +267,14 @@ def die(msg)
     ## Suggested Sets
 
     get '/sets', auth: true do
-      @sets = Gaps::DB::Set.find_each
+      @sets = Gaps::DB::GroupSet.find_each
       erb :sets
     end
 
     post '/sets', auth: true do
       set_id = params[:set]
       log.info('Adding user to subscription set', set: set_id, user: @user.email)
-      Gaps::DB::Set.find(set_id).groups_.each do |group|
+      Gaps::DB::GroupSet.find(set_id).groups_.each do |group|
         membership = @user.group_member?(group)
         through_list = @user.group_member_through_list(group)
         direct_membership = membership && !through_list
@@ -295,7 +295,7 @@ def die(msg)
 
     get '/sets/:id', auth: true do
       if params[:id] != 'new'
-        @set = Gaps::DB::Set.find(params[:id])
+        @set = Gaps::DB::GroupSet.find(params[:id])
         return not_found unless @set
       end
       @groups = Gaps::DB::Group.categorized(@user)
@@ -310,9 +310,9 @@ def die(msg)
       }
 
       if params[:id] == 'new'
-        Gaps::DB::Set.new(args).save
+        Gaps::DB::GroupSet.new(args).save
       else
-        set = Gaps::DB::Set.find(params[:id])
+        set = Gaps::DB::GroupSet.find(params[:id])
         return not_found unless set
 
         old_groups = set.groups
diff --git a/lib/gaps/db/set.rb b/lib/gaps/db/set.rb
index 928e7bd..a3c3df5 100644
--- a/lib/gaps/db/set.rb
+++ b/lib/gaps/db/set.rb
@@ -1,5 +1,5 @@
 module Gaps::DB
-  class Set < Base
+  class GroupSet < Base
     set_collection_name 'set'
 
     key :name, String