diff --git a/lib/travis/api/v3/routes.rb b/lib/travis/api/v3/routes.rb
index 483e2680..988a5e96 100644
--- a/lib/travis/api/v3/routes.rb
+++ b/lib/travis/api/v3/routes.rb
@@ -50,7 +50,11 @@ module Travis::API::V3
     resource :owner do
       route '/owner/({owner.login}|{user.login}|{organization.login}|github_id/{owner.github_id})'
       get :find
-      get :repositories, '/repos'
+
+      resource :repositories do
+        route '/repos'
+        get :for_owner
+      end
     end
 
     resource :repositories do
diff --git a/lib/travis/api/v3/services/owner/repositories.rb b/lib/travis/api/v3/services/repositories/for_owner.rb
similarity index 57%
rename from lib/travis/api/v3/services/owner/repositories.rb
rename to lib/travis/api/v3/services/repositories/for_owner.rb
index 7d376fda..9dadddf1 100644
--- a/lib/travis/api/v3/services/owner/repositories.rb
+++ b/lib/travis/api/v3/services/repositories/for_owner.rb
@@ -1,11 +1,10 @@
 module Travis::API::V3
-  class Services::Owner::Repositories < Service
+  class Services::Repositories::ForOwner < Service
     params :active, :private, prefix: :repository
-    result_type :repositories
     paginate(default_limit: 100)
 
     def run!
-      unfiltered = query(:repositories).for_owner(find(:owner))
+      unfiltered = query.for_owner(find(:owner))
       access_control.visible_repositories(unfiltered)
     end
   end
diff --git a/spec/v3/services/owner/repositories_spec.rb b/spec/v3/services/repositories/for_owner_spec.rb
similarity index 98%
rename from spec/v3/services/owner/repositories_spec.rb
rename to spec/v3/services/repositories/for_owner_spec.rb
index 8fb3ee59..dd639697 100644
--- a/spec/v3/services/owner/repositories_spec.rb
+++ b/spec/v3/services/repositories/for_owner_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Travis::API::V3::Services::Owner::Repositories do
+describe Travis::API::V3::Services::Repositories::ForOwner do
   let(:repo)  { Travis::API::V3::Models::Repository.where(owner_name: 'svenfuchs', name: 'minimal').first }
   let(:build) { repo.builds.first }
   let(:jobs)  { Travis::API::V3::Models::Build.find(build.id).jobs }