diff --git a/Structural/Facade/BiosInterface.php b/Structural/Facade/Bios.php
similarity index 73%
rename from Structural/Facade/BiosInterface.php
rename to Structural/Facade/Bios.php
index 1b0cb7a..6c9c816 100644
--- a/Structural/Facade/BiosInterface.php
+++ b/Structural/Facade/Bios.php
@@ -3,13 +3,13 @@ declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Facade;
 
-interface BiosInterface
+interface Bios
 {
     public function execute();
 
     public function waitForKeyPress();
 
-    public function launch(OsInterface $os);
+    public function launch(OperatingSystem $os);
 
     public function powerDown();
 }
diff --git a/Structural/Facade/Facade.php b/Structural/Facade/Facade.php
index 8e7b3f2..28e2d2f 100644
--- a/Structural/Facade/Facade.php
+++ b/Structural/Facade/Facade.php
@@ -6,20 +6,20 @@ namespace DesignPatterns\Structural\Facade;
 class Facade
 {
     /**
-     * @var OsInterface
+     * @var OperatingSystem
      */
     private $os;
 
     /**
-     * @var BiosInterface
+     * @var Bios
      */
     private $bios;
 
     /**
-     * @param BiosInterface $bios
-     * @param OsInterface   $os
+     * @param Bios $bios
+     * @param OperatingSystem   $os
      */
-    public function __construct(BiosInterface $bios, OsInterface $os)
+    public function __construct(Bios $bios, OperatingSystem $os)
     {
         $this->bios = $bios;
         $this->os = $os;
diff --git a/Structural/Facade/OsInterface.php b/Structural/Facade/OperatingSystem.php
similarity index 85%
rename from Structural/Facade/OsInterface.php
rename to Structural/Facade/OperatingSystem.php
index 9637f7c..9aa7247 100644
--- a/Structural/Facade/OsInterface.php
+++ b/Structural/Facade/OperatingSystem.php
@@ -3,7 +3,7 @@ declare(strict_types=1);
 
 namespace DesignPatterns\Structural\Facade;
 
-interface OsInterface
+interface OperatingSystem
 {
     public function halt();
 
diff --git a/Structural/Facade/README.rst b/Structural/Facade/README.rst
index 95e8a17..a657ce2 100644
--- a/Structural/Facade/README.rst
+++ b/Structural/Facade/README.rst
@@ -41,15 +41,15 @@ Facade.php
    :language: php
    :linenos:
 
-OsInterface.php
+OperatingSystem.php
 
-.. literalinclude:: OsInterface.php
+.. literalinclude:: OperatingSystem.php
    :language: php
    :linenos:
 
-BiosInterface.php
+Bios.php
 
-.. literalinclude:: BiosInterface.php
+.. literalinclude:: Bios.php
    :language: php
    :linenos:
 
diff --git a/Structural/Facade/Tests/FacadeTest.php b/Structural/Facade/Tests/FacadeTest.php
index 9afdc38..14d2bc6 100644
--- a/Structural/Facade/Tests/FacadeTest.php
+++ b/Structural/Facade/Tests/FacadeTest.php
@@ -4,20 +4,20 @@ declare(strict_types=1);
 namespace DesignPatterns\Structural\Facade\Tests;
 
 use DesignPatterns\Structural\Facade\Facade;
-use DesignPatterns\Structural\Facade\OsInterface;
+use DesignPatterns\Structural\Facade\OperatingSystem;
 use PHPUnit\Framework\TestCase;
 
 class FacadeTest extends TestCase
 {
     public function testComputerOn()
     {
-        /** @var OsInterface|\PHPUnit_Framework_MockObject_MockObject $os */
-        $os = $this->createMock('DesignPatterns\Structural\Facade\OsInterface');
+        /** @var OperatingSystem|\PHPUnit_Framework_MockObject_MockObject $os */
+        $os = $this->createMock('DesignPatterns\Structural\Facade\OperatingSystem');
 
         $os->method('getName')
             ->will($this->returnValue('Linux'));
 
-        $bios = $this->getMockBuilder('DesignPatterns\Structural\Facade\BiosInterface')
+        $bios = $this->getMockBuilder('DesignPatterns\Structural\Facade\Bios')
             ->setMethods(['launch', 'execute', 'waitForKeyPress'])
             ->disableAutoload()
             ->getMock();
diff --git a/Structural/Facade/uml/uml.png b/Structural/Facade/uml/uml.png
index fcea5f2..66b95eb 100644
Binary files a/Structural/Facade/uml/uml.png and b/Structural/Facade/uml/uml.png differ