diff --git a/src/Client.php b/src/Client.php
index 62d6575..417b911 100644
--- a/src/Client.php
+++ b/src/Client.php
@@ -4,12 +4,12 @@
 
 use GuzzleHttp\HandlerStack;
 use Larabros\Elogram\Container\Builder;
-use Larabros\Elogram\Entities\Comment;
-use Larabros\Elogram\Entities\LikeRepository;
-use Larabros\Elogram\Entities\Location;
-use Larabros\Elogram\Entities\Media;
-use Larabros\Elogram\Entities\Tag;
-use Larabros\Elogram\Entities\User;
+use Larabros\Elogram\Repositories\CommentsRepository;
+use Larabros\Elogram\Repositories\LikesRepository;
+use Larabros\Elogram\Repositories\LocationsRepository;
+use Larabros\Elogram\Repositories\MediaRepository;
+use Larabros\Elogram\Repositories\TagsRepository;
+use Larabros\Elogram\Repositories\UsersRepository;
 use Larabros\Elogram\Helpers\RedirectLoginHelper;
 use Larabros\Elogram\Http\Clients\AdapterInterface;
 use Larabros\Elogram\Http\Response;
@@ -82,63 +82,63 @@ protected function buildContainer(array $options)
      */
 
     /**
-     * Returns the current instance of :php:class:`User`.
+     * Returns the current instance of :php:class:`UsersRepository`.
      *
-     * @return User
+     * @return UsersRepository
      */
     public function users()
     {
-        return $this->container->get('entity.user');
+        return $this->container->get('repo.user');
     }
 
     /**
-     * Returns the current instance of :php:class:`Media`.
+     * Returns the current instance of :php:class:`MediaRepository`.
      *
-     * @return Media
+     * @return MediaRepository
      */
     public function media()
     {
-        return $this->container->get('entity.media');
+        return $this->container->get('repo.media');
     }
 
     /**
-     * Returns the current instance of :php:class:`Comment`.
+     * Returns the current instance of :php:class:`CommentsRepository`.
      *
-     * @return Comment
+     * @return CommentsRepository
      */
     public function comments()
     {
-        return $this->container->get('entity.comment');
+        return $this->container->get('repo.comment');
     }
 
     /**
-     * Returns the current instance of :php:class:`LikeRepository`.
+     * Returns the current instance of :php:class:`LikesRepository`.
      *
-     * @return LikeRepository
+     * @return LikesRepository
      */
     public function likes()
     {
-        return $this->container->get('entity.like');
+        return $this->container->get('repo.like');
     }
 
     /**
-     * Returns the current instance of :php:class:`Tag`.
+     * Returns the current instance of :php:class:`TagsRepository`.
      *
-     * @return Tag
+     * @return TagsRepository
      */
     public function tags()
     {
-        return $this->container->get('entity.tag');
+        return $this->container->get('repo.tag');
     }
 
     /**
-     * Returns the current instance of :php:class:`Location`.
+     * Returns the current instance of :php:class:`LocationsRepository`.
      *
-     * @return Location
+     * @return LocationsRepository
      */
     public function locations()
     {
-        return $this->container->get('entity.location');
+        return $this->container->get('repo.location');
     }
 
     /**
diff --git a/src/Providers/EntityServiceProvider.php b/src/Providers/EntityServiceProvider.php
index aa942c5..3504f94 100644
--- a/src/Providers/EntityServiceProvider.php
+++ b/src/Providers/EntityServiceProvider.php
@@ -2,12 +2,12 @@
 
 namespace Larabros\Elogram\Providers;
 
-use Larabros\Elogram\Entities\Comment;
-use Larabros\Elogram\Entities\LikeRepository;
-use Larabros\Elogram\Entities\Location;
-use Larabros\Elogram\Entities\Media;
-use Larabros\Elogram\Entities\Tag;
-use Larabros\Elogram\Entities\User;
+use Larabros\Elogram\Repositories\CommentsRepository;
+use Larabros\Elogram\Repositories\LikesRepository;
+use Larabros\Elogram\Repositories\LocationsRepository;
+use Larabros\Elogram\Repositories\MediaRepository;
+use Larabros\Elogram\Repositories\TagsRepository;
+use Larabros\Elogram\Repositories\UsersRepository;
 use Larabros\Elogram\Http\Clients\AdapterInterface;
 use League\Container\ServiceProvider\AbstractServiceProvider;
 
@@ -31,12 +31,12 @@ class EntityServiceProvider extends AbstractServiceProvider
      * @var array
      */
     protected $provides = [
-        'entity.user',
-        'entity.media',
-        'entity.comment',
-        'entity.like',
-        'entity.tag',
-        'entity.location',
+        'repo.user',
+        'repo.media',
+        'repo.comment',
+        'repo.like',
+        'repo.tag',
+        'repo.location',
     ];
 
     /**
@@ -48,11 +48,12 @@ class EntityServiceProvider extends AbstractServiceProvider
      */
     public function register()
     {
-        $this->getContainer()->share('entity.user', new User($this->getContainer()->get(AdapterInterface::class)));
-        $this->getContainer()->share('entity.media', new Media($this->getContainer()->get(AdapterInterface::class)));
-        $this->getContainer()->share('entity.comment', new Comment($this->getContainer()->get(AdapterInterface::class)));
-        $this->getContainer()->share('entity.like', new LikeRepository($this->getContainer()->get(AdapterInterface::class)));
-        $this->getContainer()->share('entity.tag', new Tag($this->getContainer()->get(AdapterInterface::class)));
-        $this->getContainer()->share('entity.location', new Location($this->getContainer()->get(AdapterInterface::class)));
+        $adapter = $this->getContainer()->get(AdapterInterface::class);
+        $this->getContainer()->share('repo.user', new UsersRepository($adapter));
+        $this->getContainer()->share('repo.media', new MediaRepository($adapter));
+        $this->getContainer()->share('repo.comment', new CommentsRepository($adapter));
+        $this->getContainer()->share('repo.like', new LikesRepository($adapter));
+        $this->getContainer()->share('repo.tag', new TagsRepository($adapter));
+        $this->getContainer()->share('repo.location', new LocationsRepository($adapter));
     }
 }
diff --git a/src/Entities/AbstractEntity.php b/src/Repositories/AbstractRepository.php
similarity index 67%
rename from src/Entities/AbstractEntity.php
rename to src/Repositories/AbstractRepository.php
index c59a420..e3801ea 100644
--- a/src/Entities/AbstractEntity.php
+++ b/src/Repositories/AbstractRepository.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Larabros\Elogram\Entities;
+namespace Larabros\Elogram\Repositories;
 
 use Larabros\Elogram\Http\Clients\AdapterInterface;
 
 /**
- * An abstract entity class. Any new endpoints should extend this class.
+ * An abstract repository class. Any new endpoints should extend this class.
  *
  * @package    Elogram
  * @author     Hassan Khan <contact@hassankhan.me>
  * @link       https://github.com/larabros/elogram
  * @license    MIT
  */
-abstract class AbstractEntity
+abstract class AbstractRepository
 {
     /**
      * @var AdapterInterface
@@ -20,7 +20,7 @@ abstract class AbstractEntity
     protected $client;
 
     /**
-     * Creates a new instance of :php:class:`AbstractEntity`.
+     * Creates a new instance of :php:class:`AbstractRepository`.
      *
      * @param AdapterInterface $client
      */
diff --git a/src/Entities/Comment.php b/src/Repositories/CommentsRepository.php
similarity index 93%
rename from src/Entities/Comment.php
rename to src/Repositories/CommentsRepository.php
index 5776a69..f01ba47 100644
--- a/src/Entities/Comment.php
+++ b/src/Repositories/CommentsRepository.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Larabros\Elogram\Entities;
+namespace Larabros\Elogram\Repositories;
 
 use Larabros\Elogram\Http\Response;
 
 /**
- * Comment
+ * CommentsRepository
  *
  * @package    Elogram
  * @author     Hassan Khan <contact@hassankhan.me>
  * @link       https://github.com/larabros/elogram
  * @license    MIT
  */
-class Comment extends AbstractEntity
+class CommentsRepository extends AbstractRepository
 {
 
     /**
@@ -38,7 +38,7 @@ public function get($mediaId)
      * - The comment cannot consist of all capital letters.
      *
      * @param int    $mediaId  The ID of the media object
-     * @param string $text     Text to post as a comment on the media object as specified by `$mediaId`
+     * @param string $text     Text to post as a comment on the media object
      *
      * @return Response
      *
diff --git a/src/Entities/LikeRepository.php b/src/Repositories/LikesRepository.php
similarity index 92%
rename from src/Entities/LikeRepository.php
rename to src/Repositories/LikesRepository.php
index 631efaa..2ee3891 100644
--- a/src/Entities/LikeRepository.php
+++ b/src/Repositories/LikesRepository.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Larabros\Elogram\Entities;
+namespace Larabros\Elogram\Repositories;
 
 use Larabros\Elogram\Http\Response;
 
 /**
- * LikeRepository class.
+ * LikesRepository class.
  *
  * @package    Elogram
  * @author     Hassan Khan <contact@hassankhan.me>
  * @link       https://github.com/larabros/elogram
  * @license    MIT
  */
-class LikeRepository extends AbstractEntity
+class LikesRepository extends AbstractRepository
 {
 
     /**
diff --git a/src/Entities/Location.php b/src/Repositories/LocationsRepository.php
similarity index 96%
rename from src/Entities/Location.php
rename to src/Repositories/LocationsRepository.php
index 4116553..72b51e9 100644
--- a/src/Entities/Location.php
+++ b/src/Repositories/LocationsRepository.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Larabros\Elogram\Entities;
+namespace Larabros\Elogram\Repositories;
 
 use Larabros\Elogram\Http\Response;
 
 /**
- * Location
+ * LocationsRepository
  *
  * @package    Elogram
  * @author     Hassan Khan <contact@hassankhan.me>
  * @link       https://github.com/larabros/elogram
  * @license    MIT
  */
-class Location extends AbstractEntity
+class LocationsRepository extends AbstractRepository
 {
 
     /**
diff --git a/src/Entities/Media.php b/src/Repositories/MediaRepository.php
similarity index 93%
rename from src/Entities/Media.php
rename to src/Repositories/MediaRepository.php
index 9cc43bc..97ab6d5 100644
--- a/src/Entities/Media.php
+++ b/src/Repositories/MediaRepository.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Larabros\Elogram\Entities;
+namespace Larabros\Elogram\Repositories;
 
 use Larabros\Elogram\Http\Response;
 
 /**
- * Media
+ * MediaRepository
  *
  * @package    Elogram
  * @author     Hassan Khan <contact@hassankhan.me>
  * @link       https://github.com/larabros/elogram
  * @license    MIT
  */
-class Media extends AbstractEntity
+class MediaRepository extends AbstractRepository
 {
     /**
      * Get information about a media object.
@@ -29,7 +29,7 @@ public function get($id)
     }
 
     /**
-     * This method returns the same response as :php:meth:`Media::get`
+     * This method returns the same response as :php:meth:`MediaRepository::get`
      *
      * @param string $shortcode  The shortcode of the media object
      *
diff --git a/src/Entities/Tag.php b/src/Repositories/TagsRepository.php
similarity index 94%
rename from src/Entities/Tag.php
rename to src/Repositories/TagsRepository.php
index 68ba4c2..4e7fd3e 100644
--- a/src/Entities/Tag.php
+++ b/src/Repositories/TagsRepository.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Larabros\Elogram\Entities;
+namespace Larabros\Elogram\Repositories;
 
 use Larabros\Elogram\Http\Response;
 
 /**
- * Tag
+ * TagsRepository
  *
  * @package    Elogram
  * @author     Hassan Khan <contact@hassankhan.me>
  * @link       https://github.com/larabros/elogram
  * @license    MIT
  */
-class Tag extends AbstractEntity
+class TagsRepository extends AbstractRepository
 {
     /**
      * Get information about a tag object.
diff --git a/src/Entities/User.php b/src/Repositories/UsersRepository.php
similarity index 97%
rename from src/Entities/User.php
rename to src/Repositories/UsersRepository.php
index 91c769d..a8f1a51 100644
--- a/src/Entities/User.php
+++ b/src/Repositories/UsersRepository.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Larabros\Elogram\Entities;
+namespace Larabros\Elogram\Repositories;
 
 use Larabros\Elogram\Http\Response;
 
 /**
- * User
+ * UsersRepository
  *
  * @package    Elogram
  * @author     Hassan Khan <contact@hassankhan.me>
  * @link       https://github.com/larabros/elogram
  * @license    MIT
  */
-class User extends AbstractEntity
+class UsersRepository extends AbstractRepository
 {
     /**
      * Get information about a user.
diff --git a/tests/ClientTest.php b/tests/ClientTest.php
index 23a7f34..52e43a8 100644
--- a/tests/ClientTest.php
+++ b/tests/ClientTest.php
@@ -3,12 +3,12 @@
 namespace Larabros\Elogram\Tests;
 
 use Larabros\Elogram\Config;
-use Larabros\Elogram\Entities\Comment;
-use Larabros\Elogram\Entities\LikeRepository;
-use Larabros\Elogram\Entities\Location;
-use Larabros\Elogram\Entities\Media;
-use Larabros\Elogram\Entities\Tag;
-use Larabros\Elogram\Entities\User;
+use Larabros\Elogram\Repositories\CommentsRepository;
+use Larabros\Elogram\Repositories\LikesRepository;
+use Larabros\Elogram\Repositories\LocationsRepository;
+use Larabros\Elogram\Repositories\MediaRepository;
+use Larabros\Elogram\Repositories\TagsRepository;
+use Larabros\Elogram\Repositories\UsersRepository;
 use Larabros\Elogram\Helpers\RedirectLoginHelper;
 use Larabros\Elogram\Http\Clients\MockAdapter;
 use Larabros\Elogram\Http\Response;
@@ -41,7 +41,7 @@ protected function setUp()
     public function testUsers()
     {
         $users = $this->client->users();
-        $this->assertInstanceOf(User::class, $users);
+        $this->assertInstanceOf(UsersRepository::class, $users);
     }
 
     /**
@@ -52,7 +52,7 @@ public function testUsers()
     public function testMedia()
     {
         $media = $this->client->media();
-        $this->assertInstanceOf(Media::class, $media);
+        $this->assertInstanceOf(MediaRepository::class, $media);
     }
 
     /**
@@ -63,7 +63,7 @@ public function testMedia()
     public function testComments()
     {
         $comments = $this->client->comments();
-        $this->assertInstanceOf(Comment::class, $comments);
+        $this->assertInstanceOf(CommentsRepository::class, $comments);
     }
 
     /**
@@ -74,7 +74,7 @@ public function testComments()
     public function testLikes()
     {
         $likes = $this->client->likes();
-        $this->assertInstanceOf(LikeRepository::class, $likes);
+        $this->assertInstanceOf(LikesRepository::class, $likes);
     }
 
     /**
@@ -85,7 +85,7 @@ public function testLikes()
     public function testTags()
     {
         $tags = $this->client->tags();
-        $this->assertInstanceOf(Tag::class, $tags);
+        $this->assertInstanceOf(TagsRepository::class, $tags);
     }
 
     /**
@@ -96,6 +96,6 @@ public function testTags()
     public function testLocations()
     {
         $locations = $this->client->locations();
-        $this->assertInstanceOf(Location::class, $locations);
+        $this->assertInstanceOf(LocationsRepository::class, $locations);
     }
 }
diff --git a/tests/Entities/CommentTest.php b/tests/Entities/CommentTest.php
deleted file mode 100644
index f3e2bbc..0000000
--- a/tests/Entities/CommentTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Larabros\Elogram\Tests\Entities;
-
-use Larabros\Elogram\Entities\Comment;
-use Larabros\Elogram\Http\Clients\MockAdapter;
-use Larabros\Elogram\Tests\TestCase;
-
-class CommentTest extends TestCase
-{
-    /**
-     * @var Comment
-     */
-    protected $comment;
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function setUp()
-    {
-        $this->comment = new Comment(new MockAdapter($this->getFixturesPath()));
-    }
-
-    /**
-     * @covers Larabros\Elogram\Entities\Comment::__construct()
-     * @covers Larabros\Elogram\Entities\Comment::get()
-     */
-    public function testGet()
-    {
-        $response = $this->comment->get('420')->get();
-        $this->assertCount(1, $response);
-    }
-
-    /**
-     * @covers Larabros\Elogram\Entities\Comment::__construct()
-     * @covers Larabros\Elogram\Entities\Comment::create()
-     */
-    public function testCreate()
-    {
-        $response = $this->comment->create('315', 'A comment')->get();
-        $this->assertNull($response);
-    }
-
-    /**
-     * @covers Larabros\Elogram\Entities\Comment::__construct()
-     * @covers Larabros\Elogram\Entities\Comment::delete()
-     */
-    public function testDelete()
-    {
-        $response = $this->comment->delete('315', '1')->get();
-        $this->assertNull($response);
-    }
-}
diff --git a/tests/Entities/LikeRepositoryTest.php b/tests/Entities/LikeRepositoryTest.php
deleted file mode 100644
index 9fa5ed0..0000000
--- a/tests/Entities/LikeRepositoryTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Larabros\Elogram\Tests\Entities;
-
-use Larabros\Elogram\Entities\LikeRepository;
-use Larabros\Elogram\Http\Clients\MockAdapter;
-use Larabros\Elogram\Tests\TestCase;
-
-class LikeRepositoryTest extends TestCase
-{
-    /**
-     * @var LikeRepository
-     */
-    protected $like;
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function setUp()
-    {
-        $this->like = new LikeRepository(new MockAdapter($this->getFixturesPath()));
-    }
-
-    /**
-     * @covers Larabros\Elogram\Entities\LikeRepository::__construct()
-     * @covers Larabros\Elogram\Entities\LikeRepository::get()
-     */
-    public function testGet()
-    {
-        $response = $this->like->get('420')->get();
-        $this->assertCount(3, $response);
-    }
-
-    /**
-     * @covers Larabros\Elogram\Entities\LikeRepository::__construct()
-     * @covers Larabros\Elogram\Entities\LikeRepository::like()
-     */
-    public function testCreate()
-    {
-        $response = $this->like->like('315')->get();
-        $this->assertNull($response);
-    }
-
-    /**
-     * @covers Larabros\Elogram\Entities\LikeRepository::__construct()
-     * @covers Larabros\Elogram\Entities\LikeRepository::unlike()
-     */
-    public function testDelete()
-    {
-        $response = $this->like->unlike('315')->get();
-        $this->assertNull($response);
-    }
-}
diff --git a/tests/Repositories/CommentsRepositoryTest.php b/tests/Repositories/CommentsRepositoryTest.php
new file mode 100644
index 0000000..b56b14c
--- /dev/null
+++ b/tests/Repositories/CommentsRepositoryTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Larabros\Elogram\Tests\Repositories;
+
+use Larabros\Elogram\Repositories\CommentsRepository;
+use Larabros\Elogram\Http\Clients\MockAdapter;
+use Larabros\Elogram\Tests\TestCase;
+
+class CommentsRepositoryTest extends TestCase
+{
+    /**
+     * @var CommentsRepository
+     */
+    protected $comment;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function setUp()
+    {
+        $this->comment = new CommentsRepository(new MockAdapter($this->getFixturesPath()));
+    }
+
+    /**
+     * @covers Larabros\Elogram\Repositories\CommentsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\CommentsRepository::get()
+     */
+    public function testGet()
+    {
+        $response = $this->comment->get('420')->get();
+        $this->assertCount(1, $response);
+    }
+
+    /**
+     * @covers Larabros\Elogram\Repositories\CommentsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\CommentsRepository::create()
+     */
+    public function testCreate()
+    {
+        $response = $this->comment->create('315', 'A comment')->get();
+        $this->assertNull($response);
+    }
+
+    /**
+     * @covers Larabros\Elogram\Repositories\CommentsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\CommentsRepository::delete()
+     */
+    public function testDelete()
+    {
+        $response = $this->comment->delete('315', '1')->get();
+        $this->assertNull($response);
+    }
+}
diff --git a/tests/Repositories/LikesRepositoryTest.php b/tests/Repositories/LikesRepositoryTest.php
new file mode 100644
index 0000000..ef3e8b0
--- /dev/null
+++ b/tests/Repositories/LikesRepositoryTest.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Larabros\Elogram\Tests\Repositories;
+
+use Larabros\Elogram\Repositories\LikesRepository;
+use Larabros\Elogram\Http\Clients\MockAdapter;
+use Larabros\Elogram\Tests\TestCase;
+
+class LikesRepositoryTest extends TestCase
+{
+    /**
+     * @var LikesRepository
+     */
+    protected $like;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function setUp()
+    {
+        $this->like = new LikesRepository(new MockAdapter($this->getFixturesPath()));
+    }
+
+    /**
+     * @covers Larabros\Elogram\Repositories\LikesRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\LikesRepository::get()
+     */
+    public function testGet()
+    {
+        $response = $this->like->get('420')->get();
+        $this->assertCount(3, $response);
+    }
+
+    /**
+     * @covers Larabros\Elogram\Repositories\LikesRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\LikesRepository::like()
+     */
+    public function testCreate()
+    {
+        $response = $this->like->like('315')->get();
+        $this->assertNull($response);
+    }
+
+    /**
+     * @covers Larabros\Elogram\Repositories\LikesRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\LikesRepository::unlike()
+     */
+    public function testDelete()
+    {
+        $response = $this->like->unlike('315')->get();
+        $this->assertNull($response);
+    }
+}
diff --git a/tests/Entities/LocationTest.php b/tests/Repositories/LocationsRepositoryTest.php
similarity index 51%
rename from tests/Entities/LocationTest.php
rename to tests/Repositories/LocationsRepositoryTest.php
index ef87643..cfc96ab 100644
--- a/tests/Entities/LocationTest.php
+++ b/tests/Repositories/LocationsRepositoryTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Larabros\Elogram\Tests\Entities;
+namespace Larabros\Elogram\Tests\Repositories;
 
-use Larabros\Elogram\Entities\Location;
+use Larabros\Elogram\Repositories\LocationsRepository;
 use Larabros\Elogram\Http\Clients\MockAdapter;
 use Larabros\Elogram\Tests\TestCase;
 
-class LocationTest extends TestCase
+class LocationsRepositoryTest extends TestCase
 {
     /**
-     * @var Location
+     * @var LocationsRepository
      */
     protected $location;
 
@@ -18,12 +18,12 @@ class LocationTest extends TestCase
      */
     protected function setUp()
     {
-        $this->location = new Location(new MockAdapter($this->getFixturesPath()));
+        $this->location = new LocationsRepository(new MockAdapter($this->getFixturesPath()));
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Location::__construct()
-     * @covers Larabros\Elogram\Entities\Location::get()
+     * @covers Larabros\Elogram\Repositories\LocationsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\LocationsRepository::get()
      */
     public function testGet()
     {
@@ -32,8 +32,8 @@ public function testGet()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Location::__construct()
-     * @covers Larabros\Elogram\Entities\Location::getRecentMedia()
+     * @covers Larabros\Elogram\Repositories\LocationsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\LocationsRepository::getRecentMedia()
      */
     public function testGetRecentMedia()
     {
@@ -42,8 +42,8 @@ public function testGetRecentMedia()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Location::__construct()
-     * @covers Larabros\Elogram\Entities\Location::search()
+     * @covers Larabros\Elogram\Repositories\LocationsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\LocationsRepository::search()
      */
     public function testSearch()
     {
@@ -52,8 +52,8 @@ public function testSearch()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Location::__construct()
-     * @covers Larabros\Elogram\Entities\Location::searchByFacebookPlacesId()
+     * @covers Larabros\Elogram\Repositories\LocationsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\LocationsRepository::searchByFacebookPlacesId()
      */
     public function testSearchByFacebookPlacesId()
     {
@@ -62,8 +62,8 @@ public function testSearchByFacebookPlacesId()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Location::__construct()
-     * @covers Larabros\Elogram\Entities\Location::searchByFoursquareId()
+     * @covers Larabros\Elogram\Repositories\LocationsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\LocationsRepository::searchByFoursquareId()
      */
     public function testSearchByFoursquareId()
     {
diff --git a/tests/Entities/MediaTest.php b/tests/Repositories/MediaRepositoryTest.php
similarity index 56%
rename from tests/Entities/MediaTest.php
rename to tests/Repositories/MediaRepositoryTest.php
index 0e488ca..5da00d4 100644
--- a/tests/Entities/MediaTest.php
+++ b/tests/Repositories/MediaRepositoryTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Larabros\Elogram\Tests\Entities;
+namespace Larabros\Elogram\Tests\Repositories;
 
-use Larabros\Elogram\Entities\Media;
+use Larabros\Elogram\Repositories\MediaRepository;
 use Larabros\Elogram\Http\Clients\MockAdapter;
 use Larabros\Elogram\Tests\TestCase;
 
-class MediaTest extends TestCase
+class MediaRepositoryTest extends TestCase
 {
     /**
-     * @var Media
+     * @var MediaRepository
      */
     protected $media;
 
@@ -18,12 +18,12 @@ class MediaTest extends TestCase
      */
     protected function setUp()
     {
-        $this->media = new Media(new MockAdapter($this->getFixturesPath()));
+        $this->media = new MediaRepository(new MockAdapter($this->getFixturesPath()));
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Media::__construct()
-     * @covers Larabros\Elogram\Entities\Media::get()
+     * @covers Larabros\Elogram\Repositories\MediaRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\MediaRepository::get()
      */
     public function testGet()
     {
@@ -33,8 +33,8 @@ public function testGet()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Media::__construct()
-     * @covers Larabros\Elogram\Entities\Media::getByShortcode()
+     * @covers Larabros\Elogram\Repositories\MediaRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\MediaRepository::getByShortcode()
      */
     public function testGetByShortcode()
     {
@@ -44,8 +44,8 @@ public function testGetByShortcode()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Media::__construct()
-     * @covers Larabros\Elogram\Entities\Media::search()
+     * @covers Larabros\Elogram\Repositories\MediaRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\MediaRepository::search()
      */
     public function testSearch()
     {
diff --git a/tests/Entities/TagTest.php b/tests/Repositories/TagsRepositoryTest.php
similarity index 52%
rename from tests/Entities/TagTest.php
rename to tests/Repositories/TagsRepositoryTest.php
index 63e30a5..5fd05d4 100644
--- a/tests/Entities/TagTest.php
+++ b/tests/Repositories/TagsRepositoryTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Larabros\Elogram\Tests\Entities;
+namespace Larabros\Elogram\Tests\Repositories;
 
-use Larabros\Elogram\Entities\Tag;
+use Larabros\Elogram\Repositories\TagsRepository;
 use Larabros\Elogram\Http\Clients\MockAdapter;
 use Larabros\Elogram\Tests\TestCase;
 
-class TagTest extends TestCase
+class TagsRepositoryTest extends TestCase
 {
     /**
-     * @var Tag
+     * @var TagsRepository
      */
     protected $tag;
 
@@ -18,12 +18,12 @@ class TagTest extends TestCase
      */
     protected function setUp()
     {
-        $this->tag = new Tag(new MockAdapter($this->getFixturesPath()));
+        $this->tag = new TagsRepository(new MockAdapter($this->getFixturesPath()));
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Tag::__construct()
-     * @covers Larabros\Elogram\Entities\Tag::get()
+     * @covers Larabros\Elogram\Repositories\TagsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\TagsRepository::get()
      */
     public function testGet()
     {
@@ -33,8 +33,8 @@ public function testGet()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Tag::__construct()
-     * @covers Larabros\Elogram\Entities\Tag::getRecentMedia()
+     * @covers Larabros\Elogram\Repositories\TagsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\TagsRepository::getRecentMedia()
      */
     public function testGetRecentMedia()
     {
@@ -43,8 +43,8 @@ public function testGetRecentMedia()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\Tag::__construct()
-     * @covers Larabros\Elogram\Entities\Tag::search()
+     * @covers Larabros\Elogram\Repositories\TagsRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\TagsRepository::search()
      */
     public function testSearch()
     {
diff --git a/tests/Entities/UserTest.php b/tests/Repositories/UsersRepositoryTest.php
similarity index 53%
rename from tests/Entities/UserTest.php
rename to tests/Repositories/UsersRepositoryTest.php
index 8a7991b..05e78f4 100644
--- a/tests/Entities/UserTest.php
+++ b/tests/Repositories/UsersRepositoryTest.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace Larabros\Elogram\Tests\Entities;
+namespace Larabros\Elogram\Tests\Repositories;
 
-use Larabros\Elogram\Entities\User;
+use Larabros\Elogram\Repositories\UsersRepository;
 use Larabros\Elogram\Http\Clients\MockAdapter;
 use Larabros\Elogram\Tests\TestCase;
 
-class UserTest extends TestCase
+class UsersRepositoryTest extends TestCase
 {
     /**
-     * @var User
+     * @var UsersRepository
      */
     protected $user;
 
@@ -18,12 +18,12 @@ class UserTest extends TestCase
      */
     protected function setUp()
     {
-        $this->user = new User(new MockAdapter($this->getFixturesPath()));
+        $this->user = new UsersRepository(new MockAdapter($this->getFixturesPath()));
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::get()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::get()
      */
     public function testGet()
     {
@@ -32,8 +32,8 @@ public function testGet()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::getMedia()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::getMedia()
      */
     public function testGetMedia()
     {
@@ -42,8 +42,8 @@ public function testGetMedia()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::getLikedMedia()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::getLikedMedia()
      */
     public function testGetLikedMedia()
     {
@@ -52,8 +52,8 @@ public function testGetLikedMedia()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::search()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::search()
      */
     public function testSearch()
     {
@@ -62,8 +62,8 @@ public function testSearch()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::find()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::find()
      */
     public function testFind()
     {
@@ -72,8 +72,8 @@ public function testFind()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::find()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::find()
      */
     public function testFindReturnsNullWhenNothingFound()
     {
@@ -82,8 +82,8 @@ public function testFindReturnsNullWhenNothingFound()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::follows()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::follows()
      */
     public function testFollows()
     {
@@ -92,8 +92,8 @@ public function testFollows()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::followedBy()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::followedBy()
      */
     public function testFollowedBy()
     {
@@ -102,8 +102,8 @@ public function testFollowedBy()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::requestedBy()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::requestedBy()
      */
     public function testRequestedBy()
     {
@@ -112,8 +112,8 @@ public function testRequestedBy()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::getRelationship()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::getRelationship()
      */
     public function testGetRelationship()
     {
@@ -123,8 +123,8 @@ public function testGetRelationship()
     }
 
     /**
-     * @covers Larabros\Elogram\Entities\User::__construct()
-     * @covers Larabros\Elogram\Entities\User::setRelationship()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::__construct()
+     * @covers Larabros\Elogram\Repositories\UsersRepository::setRelationship()
      */
     public function testSetRelationship()
     {