diff --git a/Builder/Parts/Vehicle.php b/Builder/Parts/Vehicle.php
index 7f627b7..15c39c0 100644
--- a/Builder/Parts/Vehicle.php
+++ b/Builder/Parts/Vehicle.php
@@ -7,7 +7,7 @@
 namespace DesignPatterns\Builder\Parts;
 
 /**
- * Vehicle is a contract for a vehicle
+ * VehicleInterface is a contract for a vehicle
  */
 abstract class Vehicle
 {
diff --git a/SimpleFactory/Bicycle.php b/SimpleFactory/Bicycle.php
index 39c2d32..50f1415 100644
--- a/SimpleFactory/Bicycle.php
+++ b/SimpleFactory/Bicycle.php
@@ -9,7 +9,7 @@ namespace DesignPatterns\SimpleFactory;
 /**
  * Bicycle is a bicycle
  */
-class Bicycle implements Vehicle
+class Bicycle implements VehicleInterface
 {
 
     public function driveTo($destination)
diff --git a/SimpleFactory/ConcreteFactory.php b/SimpleFactory/ConcreteFactory.php
index 01ba1ad..fa9f4ad 100644
--- a/SimpleFactory/ConcreteFactory.php
+++ b/SimpleFactory/ConcreteFactory.php
@@ -36,7 +36,7 @@ class ConcreteFactory
      * Creates a vehicle
      * 
      * @param string $type a known type key
-     * @return Vehicle a new instance of Vehicle
+     * @return VehicleInterface a new instance of VehicleInterface
      * @throws \InvalidArgumentException
      */
     public function createVehicle($type)
diff --git a/SimpleFactory/Scooter.php b/SimpleFactory/Scooter.php
index 925d7d2..2e386b7 100644
--- a/SimpleFactory/Scooter.php
+++ b/SimpleFactory/Scooter.php
@@ -1,20 +1,17 @@
 <?php
 
-/*
- * DesignPatternPHP
- */
-
 namespace DesignPatterns\SimpleFactory;
 
 /**
  * Scooter is a Scooter
  */
-class Scooter implements Vehicle
+class Scooter implements VehicleInterface
 {
-
+    /**
+     * @param mixed $destination
+     */
     public function driveTo($destination)
     {
-        
-    }
 
-}
\ No newline at end of file
+    }
+}
diff --git a/SimpleFactory/Vehicle.php b/SimpleFactory/Vehicle.php
deleted file mode 100644
index 87b0ef3..0000000
--- a/SimpleFactory/Vehicle.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- * DesignPatternPHP
- */
-
-namespace DesignPatterns\SimpleFactory;
-
-/**
- * Vehicle is a contract for a vehicle
- */
-interface Vehicle
-{
-
-    function driveTo($destination);
-}
\ No newline at end of file
diff --git a/SimpleFactory/VehicleInterface.php b/SimpleFactory/VehicleInterface.php
new file mode 100644
index 0000000..66dc3fd
--- /dev/null
+++ b/SimpleFactory/VehicleInterface.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace DesignPatterns\SimpleFactory;
+
+/**
+ * VehicleInterface is a contract for a vehicle
+ */
+interface VehicleInterface
+{
+    /**
+     * @param mixed $destination
+     *
+     * @return mixed
+     */
+    public function driveTo($destination);
+}
diff --git a/StaticFactory/Formatter.php b/StaticFactory/FormatterInterface.php
similarity index 100%
rename from StaticFactory/Formatter.php
rename to StaticFactory/FormatterInterface.php
diff --git a/Tests/SimpleFactory/SimpleFactoryTest.php b/Tests/SimpleFactory/SimpleFactoryTest.php
index 82db42d..42de427 100644
--- a/Tests/SimpleFactory/SimpleFactoryTest.php
+++ b/Tests/SimpleFactory/SimpleFactoryTest.php
@@ -35,7 +35,7 @@ class SimpleFactoryTest extends \PHPUnit_Framework_TestCase
     public function testCreation($type)
     {
         $obj = $this->factory->createVehicle($type);
-        $this->assertInstanceOf('DesignPatterns\SimpleFactory\Vehicle', $obj);
+        $this->assertInstanceOf('DesignPatterns\SimpleFactory\VehicleInterface', $obj);
     }
 
     /**
diff --git a/Tests/StaticFactory/StaticFactoryTest.php b/Tests/StaticFactory/StaticFactoryTest.php
index e906705..65087f5 100644
--- a/Tests/StaticFactory/StaticFactoryTest.php
+++ b/Tests/StaticFactory/StaticFactoryTest.php
@@ -25,7 +25,7 @@ class StaticFactoryTest extends \PHPUnit_Framework_TestCase
     public function testCreation($type)
     {
         $obj = StaticFactory::factory($type);
-        $this->assertInstanceOf('DesignPatterns\StaticFactory\Formatter', $obj);
+        $this->assertInstanceOf('DesignPatterns\StaticFactory\FormatterInterface', $obj);
     }
 
 }