diff --git a/system/src/Grav/Common/Markdown/Markdown.php b/system/src/Grav/Common/Markdown/Parsedown.php
similarity index 65%
rename from system/src/Grav/Common/Markdown/Markdown.php
rename to system/src/Grav/Common/Markdown/Parsedown.php
index 07db1c435..1db2d1707 100644
--- a/system/src/Grav/Common/Markdown/Markdown.php
+++ b/system/src/Grav/Common/Markdown/Parsedown.php
@@ -1,9 +1,9 @@
 <?php
 namespace Grav\Common\Markdown;
 
-class Markdown extends \Parsedown
+class Parsedown extends \Parsedown
 {
-    use MarkdownGravLinkTrait;
+    use ParsedownGravTrait;
 
     public function __construct($page)
     {
diff --git a/system/src/Grav/Common/Markdown/MarkdownExtra.php b/system/src/Grav/Common/Markdown/ParsedownExtra.php
similarity index 67%
rename from system/src/Grav/Common/Markdown/MarkdownExtra.php
rename to system/src/Grav/Common/Markdown/ParsedownExtra.php
index dd55602e9..da20ca1e0 100644
--- a/system/src/Grav/Common/Markdown/MarkdownExtra.php
+++ b/system/src/Grav/Common/Markdown/ParsedownExtra.php
@@ -1,9 +1,9 @@
 <?php
 namespace Grav\Common\Markdown;
 
-class MarkdownExtra extends \ParsedownExtra
+class ParsedownExtra extends \ParsedownExtra
 {
-    use MarkdownGravLinkTrait;
+    use ParsedownGravTrait;
 
     public function __construct($page)
     {
diff --git a/system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
similarity index 99%
rename from system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php
rename to system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index e2c8e3631..642be7562 100644
--- a/system/src/Grav/Common/Markdown/MarkdownGravLinkTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -10,7 +10,7 @@ use Grav\Common\Uri;
 /**
  * A trait to add some custom processing to the identifyLink() method in Parsedown and ParsedownExtra
  */
-trait MarkdownGravLinkTrait
+trait ParsedownGravTrait
 {
     use GravTrait;
     protected $page;
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index e3c656f10..f23f9adc1 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -10,8 +10,8 @@ use Grav\Common\Twig;
 use Grav\Common\Uri;
 use Grav\Common\Grav;
 use Grav\Common\Taxonomy;
-use Grav\Common\Markdown\Markdown;
-use Grav\Common\Markdown\MarkdownExtra;
+use Grav\Common\Markdown\Parsedown;
+use Grav\Common\Markdown\ParsedownExtra;
 use Grav\Common\Data\Blueprint;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\File\MarkdownFile;
@@ -1607,9 +1607,9 @@ class Page
 
         // get the appropriate setting for markdown extra
         if (isset($this->markdown_extra) ? $this->markdown_extra : $config->get('system.pages.markdown_extra')) {
-            $parsedown = new MarkdownExtra($this);
+            $parsedown = new ParsedownExtra($this);
         } else {
-            $parsedown = new Markdown($this);
+            $parsedown = new Parsedown($this);
         }
         $content = $parsedown->text($content);
         return $content;