diff --git a/src/Contract.php b/src/Contract.php
index d3a5e8e..60c179b 100644
--- a/src/Contract.php
+++ b/src/Contract.php
@@ -27,7 +27,7 @@ use Web3\Contracts\Types\Str;
 use Web3\Contracts\Types\Uinteger;
 use Web3\Validators\AddressValidator;
 use Web3\Validators\HexValidator;
-use Web3\Formatters\Address as AddressFormatter;
+use Web3\Formatters\AddressFormatter;
 
 class Contract
 {
diff --git a/src/Formatters/Address.php b/src/Formatters/AddressFormatter.php
similarity index 94%
rename from src/Formatters/Address.php
rename to src/Formatters/AddressFormatter.php
index 0c596b9..4c83107 100644
--- a/src/Formatters/Address.php
+++ b/src/Formatters/AddressFormatter.php
@@ -16,7 +16,7 @@ use Web3\Utils;
 use Web3\Formatters\IFormatter;
 use Web3\Formatters\Integer as IntegerFormatter;
 
-class Address implements IFormatter
+class AddressFormatter implements IFormatter
 {
     /**
      * format
diff --git a/test/unit/AddressFormatterTest.php b/test/unit/AddressFormatterTest.php
index 5b8429e..6bacb9f 100644
--- a/test/unit/AddressFormatterTest.php
+++ b/test/unit/AddressFormatterTest.php
@@ -3,14 +3,14 @@
 namespace Test\Unit;
 
 use Test\TestCase;
-use Web3\Formatters\Address;
+use Web3\Formatters\AddressFormatter;
 
 class AddressFormatterTest extends TestCase
 {
     /**
      * formatter
      * 
-     * @var \Web3\Formatters\Address
+     * @var \Web3\Formatters\AddressFormatter
      */
     protected $formatter;
 
@@ -22,7 +22,7 @@ class AddressFormatterTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $this->formatter = new Address;
+        $this->formatter = new AddressFormatter;
     }
 
     /**