diff --git a/Parsedown.php b/Parsedown.php
index 93a6016..f43c2df 100755
--- a/Parsedown.php
+++ b/Parsedown.php
@@ -80,7 +80,7 @@ class Parsedown
     #
 
     protected $BlockTypes = array(
-        '#' => array('Atx'),
+        '#' => array('Header'),
         '*' => array('Rule', 'List'),
         '+' => array('List'),
         '-' => array('Setext', 'Table', 'Rule', 'List'),
@@ -270,34 +270,6 @@ class Parsedown
         return $markup;
     }
 
-    #
-    # Atx
-
-    protected function blockAtx($Line)
-    {
-        if (isset($Line['text'][1]))
-        {
-            $level = 1;
-
-            while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
-            {
-                $level ++;
-            }
-
-            $text = trim($Line['text'], '# ');
-
-            $Block = array(
-                'element' => array(
-                    'name' => 'h' . min(6, $level),
-                    'text' => $text,
-                    'handler' => 'line',
-                ),
-            );
-
-            return $Block;
-        }
-    }
-
     #
     # Code
 
@@ -476,6 +448,34 @@ class Parsedown
         return $Block;
     }
 
+    #
+    # Header
+
+    protected function blockHeader($Line)
+    {
+        if (isset($Line['text'][1]))
+        {
+            $level = 1;
+
+            while (isset($Line['text'][$level]) and $Line['text'][$level] === '#')
+            {
+                $level ++;
+            }
+
+            $text = trim($Line['text'], '# ');
+
+            $Block = array(
+                'element' => array(
+                    'name' => 'h' . min(6, $level),
+                    'text' => $text,
+                    'handler' => 'line',
+                ),
+            );
+
+            return $Block;
+        }
+    }
+
     #
     # List