diff --git a/phpunit.xml b/phpunit.xml
index 313a9e168..5dddd5b87 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -22,6 +22,7 @@
             <directory>tests/unit/Variant</directory>
             <file>tests/unit/EvalFactoryTest.php</file>
             <file>tests/unit/FenHeuristicsTest.php</file>
+            <file>tests/unit/FenSignalTest.php</file>
             <file>tests/unit/FenToBoardFactoryTest.php</file>
             <file>tests/unit/SanHeuristicsTest.php</file>
         </testsuite>
diff --git a/src/Media/BoardToFenSignal.php b/src/FenSignal.php
similarity index 88%
rename from src/Media/BoardToFenSignal.php
rename to src/FenSignal.php
index ddb58ff86..c6d85d2b0 100644
--- a/src/Media/BoardToFenSignal.php
+++ b/src/FenSignal.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace Chess\Media;
+namespace Chess;
 
 use Chess\FenHeuristics;
-use Chess\Exception\MediaException;
 use Chess\Function\FastFunction;
 use Chess\Labeller\GoldbachLabeller;
 use Chess\Movetext\SanMovetext;
@@ -16,7 +15,7 @@
  * Discrete ternary oscillations of a game are encoded in a one-dimensional
  * array of integer values.
  */
-class BoardToFenSignal
+class FenSignal
 {
     /**
      * Maximum number of moves.
@@ -41,11 +40,11 @@ public function __construct(string $movetext, AbstractBoard $board)
         $sanMovetext = new SanMovetext($board->move, $movetext);
 
         if (!$sanMovetext->validate()) {
-            throw new MediaException();
+            throw new \InvalidArgumentException();
         }
 
         if (self::MAX_MOVES < count($sanMovetext->moves)) {
-            throw new MediaException();
+            throw new \InvalidArgumentException();
         }
 
         foreach ($sanMovetext->moves as $val) {
diff --git a/tests/unit/Media/BoardToFenSignalTest.php b/tests/unit/FenSignalTest.php
similarity index 78%
rename from tests/unit/Media/BoardToFenSignalTest.php
rename to tests/unit/FenSignalTest.php
index a72eaaadb..aa1e9d67f 100644
--- a/tests/unit/Media/BoardToFenSignalTest.php
+++ b/tests/unit/FenSignalTest.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Chess\Tests\Unit\Media;
+namespace Chess\Tests\Unit;
 
-use Chess\Media\BoardToFenSignal;
+use Chess\FenSignal;
 use Chess\Tests\AbstractUnitTestCase;
 use Chess\Variant\Classical\Board;
 
-class BoardToFenSignalTest extends AbstractUnitTestCase
+class FenSignalTest extends AbstractUnitTestCase
 {
     /**
      * @test
@@ -39,7 +39,7 @@ public function A74()
 
         $board = new Board();
 
-        $signal = (new BoardToFenSignal($A74, $board))->signal;
+        $signal = (new FenSignal($A74, $board))->signal;
 
         $this->assertSame($expected, $signal);
     }