diff --git a/composer.json b/composer.json
index 2ac14ce..f99c0b1 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,10 @@
     "autoload": {
         "psr-4": {
             "CoiSA\\ServiceProvider\\": "src/"
-        }
+        },
+        "files": [
+            "config/autoload.php"
+        ]
     },
     "autoload-dev": {
         "psr-4": {
diff --git a/config/autoload.php b/config/autoload.php
new file mode 100644
index 0000000..2a29e6c
--- /dev/null
+++ b/config/autoload.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of coisa/service-provider.
+ *
+ * This source file is subject to the license that is bundled
+ * with this source code in the file LICENSE.
+ *
+ * @link      https://github.com/coisa/service-provider
+ *
+ * @copyright Copyright (c) 2020 Felipe Sayão Lobato Abreu <github@felipeabreu.com.br>
+ * @license   https://opensource.org/licenses/MIT MIT License
+ */
+
+/**
+ * @deprecated only for retro-compatibility purpose
+ */
+\class_alias(
+    'CoiSA\\ServiceProvider\\AggregateServiceProvider',
+    'CoiSA\\ServiceProvider\\ServiceProviderAggregator'
+);
+\class_alias(
+    'CoiSA\\ServiceProvider\\Adapter\\InteropServiceProviderAdapter',
+    'CoiSA\\ServiceProvider\\InteropServiceProviderAdapter'
+);
diff --git a/src/InteropServiceProviderAdapter.php b/src/Adapter/InteropServiceProviderAdapter.php
similarity index 87%
rename from src/InteropServiceProviderAdapter.php
rename to src/Adapter/InteropServiceProviderAdapter.php
index 89f6d5d..e37b9ae 100644
--- a/src/InteropServiceProviderAdapter.php
+++ b/src/Adapter/InteropServiceProviderAdapter.php
@@ -11,14 +11,15 @@
  * @copyright Copyright (c) 2020 Felipe Sayão Lobato Abreu <github@felipeabreu.com.br>
  * @license   https://opensource.org/licenses/MIT MIT License
  */
-namespace CoiSA\ServiceProvider;
+namespace CoiSA\ServiceProvider\Adapter;
 
+use CoiSA\ServiceProvider\ServiceProvider;
 use Interop\Container\ServiceProviderInterface as InteropServiceProvider;
 
 /**
  * Class InteropServiceProviderAdapter.
  *
- * @package CoiSA\ServiceProvider
+ * @package CoiSA\ServiceProvider\Adapter
  */
 final class InteropServiceProviderAdapter extends ServiceProvider
 {
diff --git a/src/ServiceProviderAggregator.php b/src/AggregateServiceProvider.php
similarity index 95%
rename from src/ServiceProviderAggregator.php
rename to src/AggregateServiceProvider.php
index 66f69a9..474ed20 100644
--- a/src/ServiceProviderAggregator.php
+++ b/src/AggregateServiceProvider.php
@@ -16,11 +16,11 @@
 use Interop\Container\ServiceProviderInterface as InteropServiceProvider;
 
 /**
- * Class ServiceProviderAggregator.
+ * Class AggregateServiceProvider.
  *
  * @package CoiSA\ServiceProvider
  */
-final class ServiceProviderAggregator extends ServiceProvider implements \IteratorAggregate
+final class AggregateServiceProvider extends ServiceProvider implements \IteratorAggregate
 {
     /**
      * @var InteropServiceProvider[]
@@ -28,7 +28,7 @@ final class ServiceProviderAggregator extends ServiceProvider implements \Iterat
     private $serviceProviders = array();
 
     /**
-     * ServiceProviderAggregator constructor.
+     * AggregateServiceProvider constructor.
      *
      * @param InteropServiceProvider[] $serviceProviders
      */
diff --git a/tests/Unit/ServiceProviderAggregatorTest.php b/tests/Unit/AggregateServiceProviderTest.php
similarity index 88%
rename from tests/Unit/ServiceProviderAggregatorTest.php
rename to tests/Unit/AggregateServiceProviderTest.php
index 52fde28..cd4cc9a 100644
--- a/tests/Unit/ServiceProviderAggregatorTest.php
+++ b/tests/Unit/AggregateServiceProviderTest.php
@@ -13,15 +13,15 @@
  */
 namespace CoiSA\ServiceProvider\Test\Unit;
 
+use CoiSA\ServiceProvider\AggregateServiceProvider;
 use CoiSA\ServiceProvider\Factory\CallableFactory;
-use CoiSA\ServiceProvider\ServiceProviderAggregator;
 
 /**
- * Class ServiceProviderAggregatorTest.
+ * Class AggregateServiceProviderTest.
  *
  * @package CoiSA\ServiceProvider\Test\Unit
  */
-final class ServiceProviderAggregatorTest extends ServiceProviderTestCase
+final class AggregateServiceProviderTest extends ServiceProviderTestCase
 {
     public function testGetServiceProvidersWillReturnGivenServiceProviders()
     {
@@ -36,7 +36,7 @@ public function testGetServiceProvidersWillReturnGivenServiceProviders()
             $serviceProviders[] = $serviceProvider->reveal();
         }
 
-        $serviceProviderAggregator = new ServiceProviderAggregator($serviceProviders);
+        $serviceProviderAggregator = new AggregateServiceProvider($serviceProviders);
 
         self::assertEquals($serviceProviders, $serviceProviderAggregator->getServiceProviders());
     }
@@ -54,7 +54,7 @@ public function testGetIteratorWillReturnIteratorOfGivenServiceProviders()
             $serviceProviders[] = $serviceProvider->reveal();
         }
 
-        $serviceProviderAggregator = new ServiceProviderAggregator($serviceProviders);
+        $serviceProviderAggregator = new AggregateServiceProvider($serviceProviders);
 
         self::assertEquals(
             $serviceProviders,
@@ -68,7 +68,7 @@ public function testAppendWillAppendServiceProvider()
         $serviceProvider->getFactories()->willReturn(array());
         $serviceProvider->getExtensions()->willReturn(array());
 
-        $serviceProviderAggregator = new ServiceProviderAggregator();
+        $serviceProviderAggregator = new AggregateServiceProvider();
         $serviceProviderAggregator->append($serviceProvider->reveal());
 
         self::assertEquals(array($serviceProvider->reveal()), $serviceProviderAggregator->getServiceProviders());
@@ -81,7 +81,7 @@ public function testAppendWillExtendGivenServiceProviderExtensions()
         $serviceProvider->getExtensions()->willReturn(array('id' => function() {
         }));
 
-        $serviceProviderAggregator = new ServiceProviderAggregator();
+        $serviceProviderAggregator = new AggregateServiceProvider();
         $serviceProviderAggregator->append($serviceProvider->reveal());
 
         self::assertInstanceOf(
@@ -107,7 +107,7 @@ public function testAppendWillSetServiceProviderFactories()
         $serviceProvider2->getFactories()->willReturn(array('test' => $factory2));
         $serviceProvider2->getExtensions()->willReturn(array());
 
-        $serviceProviderAggregator = new ServiceProviderAggregator();
+        $serviceProviderAggregator = new AggregateServiceProvider();
         $serviceProviderAggregator->append($serviceProvider1->reveal());
 
         self::assertSame($factory1, $serviceProviderAggregator->getFactory('test'));
@@ -127,7 +127,7 @@ public function testPrependWillPrependServiceProvider()
         $serviceProviderPrepend->getFactories()->willReturn(array());
         $serviceProviderPrepend->getExtensions()->willReturn(array());
 
-        $serviceProviderAggregator = new ServiceProviderAggregator();
+        $serviceProviderAggregator = new AggregateServiceProvider();
         $serviceProviderAggregator->append($serviceProviderAppend->reveal());
         $serviceProviderAggregator->prepend($serviceProviderPrepend->reveal());
 
@@ -154,7 +154,7 @@ public function testPrependWillNotOverwriteFactories()
         $serviceProvider2->getFactories()->willReturn(array('test' => $factory2));
         $serviceProvider2->getExtensions()->willReturn(array());
 
-        $serviceProviderAggregator = new ServiceProviderAggregator();
+        $serviceProviderAggregator = new AggregateServiceProvider();
         $serviceProviderAggregator->append($serviceProvider1->reveal());
 
         self::assertSame($factory1, $serviceProviderAggregator->getFactory('test'));
@@ -171,7 +171,7 @@ public function testPrependWillExtendGivenServiceProviderExtensions()
         $serviceProvider->getExtensions()->willReturn(array('id' => function() {
         }));
 
-        $serviceProviderAggregator = new ServiceProviderAggregator();
+        $serviceProviderAggregator = new AggregateServiceProvider();
         $serviceProviderAggregator->prepend($serviceProvider->reveal());
 
         self::assertInstanceOf(
@@ -182,6 +182,6 @@ public function testPrependWillExtendGivenServiceProviderExtensions()
 
     protected function createServiceProvider()
     {
-        return new ServiceProviderAggregator();
+        return new AggregateServiceProvider();
     }
 }