diff --git a/lib/travis/api/v3/models/repository.rb b/lib/travis/api/v3/models/repository.rb
index 2c0756f5..778dbf09 100644
--- a/lib/travis/api/v3/models/repository.rb
+++ b/lib/travis/api/v3/models/repository.rb
@@ -6,7 +6,7 @@ module Travis::API::V3
     has_many :builds,      dependent: :delete_all, order: 'builds.id DESC'.freeze
     has_many :permissions, dependent: :delete_all
     has_many :users,       through:   :permissions
-    has_many :starred_repositories
+    has_many :stars
 
     belongs_to :owner, polymorphic: true
     belongs_to :last_build, class_name: 'Travis::API::V3::Models::Build'.freeze
diff --git a/lib/travis/api/v3/models/starred_repository.rb b/lib/travis/api/v3/models/star.rb
similarity index 65%
rename from lib/travis/api/v3/models/starred_repository.rb
rename to lib/travis/api/v3/models/star.rb
index 5411d2db..a9590b5d 100644
--- a/lib/travis/api/v3/models/starred_repository.rb
+++ b/lib/travis/api/v3/models/star.rb
@@ -1,5 +1,5 @@
 module Travis::API::V3
-  class Models::StarredRepository < Model
+  class Models::Star < Model
     belongs_to :user
     belongs_to :repository
   end
diff --git a/lib/travis/api/v3/models/user.rb b/lib/travis/api/v3/models/user.rb
index 1d638b24..114c1459 100644
--- a/lib/travis/api/v3/models/user.rb
+++ b/lib/travis/api/v3/models/user.rb
@@ -6,7 +6,7 @@ module Travis::API::V3
     has_many :tokens,        dependent: :destroy
     has_many :organizations, through:   :memberships
     has_many :repositories,  as:        :owner
-    has_many :starred_repositories #TODO
+    has_many :stars #TODO
     has_one  :subscription,  as:        :owner
 
     serialize :github_oauth_token, Extensions::EncryptedColumn.new(disable: true)
diff --git a/lib/travis/api/v3/queries/repositories.rb b/lib/travis/api/v3/queries/repositories.rb
index 70467c3e..aaa0f04a 100644
--- a/lib/travis/api/v3/queries/repositories.rb
+++ b/lib/travis/api/v3/queries/repositories.rb
@@ -23,7 +23,7 @@ module Travis::API::V3
 
       if user and not starred.nil?
         # user.id works
-        list = list.joins(:starred_repositories).where(starred_repositories: { user_id: user.id })
+        list = list.joins(:stars).where(stars: { user_id: user.id })
       end
 
       if includes? 'repository.last_build'.freeze or includes? 'build'.freeze
diff --git a/lib/travis/api/v3/queries/repository.rb b/lib/travis/api/v3/queries/repository.rb
index 60324719..faa0f5b4 100644
--- a/lib/travis/api/v3/queries/repository.rb
+++ b/lib/travis/api/v3/queries/repository.rb
@@ -9,13 +9,13 @@ module Travis::API::V3
     end
 
     def star(repository, current_user)
-      starred = Models::StarredRepository.where(repository_id: repository.id, user_id: current_user.id).first
-      Models::StarredRepository.create(repository_id: repository.id, user_id: current_user.id) unless starred
+      starred = Models::Star.where(repository_id: repository.id, user_id: current_user.id).first
+      Models::Star.create(repository_id: repository.id, user_id: current_user.id) unless starred
       repository
     end
 
     def unstar(repository, current_user)
-      starred = Models::StarredRepository.where(repository_id: repository.id, user_id: current_user.id).first
+      starred = Models::Star.where(repository_id: repository.id, user_id: current_user.id).first
       starred.delete if starred
       repository
     end
diff --git a/lib/travis/api/v3/renderer/repository.rb b/lib/travis/api/v3/renderer/repository.rb
index 4f83327d..0cb1f04f 100644
--- a/lib/travis/api/v3/renderer/repository.rb
+++ b/lib/travis/api/v3/renderer/repository.rb
@@ -21,7 +21,7 @@ module Travis::API::V3
 
     def starred
       return false unless access_control.user
-      Models::StarredRepository.where(repository_id: id, user_id: access_control.user.id).any?
+      Models::Star.where(repository_id: id, user_id: access_control.user.id).any?
     end
 
     def include_default_branch?