diff --git a/system/admin/admin.php b/system/admin/admin.php
index 4661c2b..18cb423 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -1214,8 +1214,8 @@ function rename_category_folder($new_name, $old_file)
 
 }
 
-// Return static page.
-function find_draft_pages($static = null)
+// Return draft static page.
+function find_draft_page($static = null)
 {
     $posts = get_draft_pages();
 
@@ -1264,8 +1264,8 @@ function find_draft_pages($static = null)
     return $tmp;
 }
 
-// Return static page.
-function find_draft_subpages($static = null, $sub_static = null)
+// Return draft static subpage.
+function find_draft_subpage($static = null, $sub_static = null)
 {
     $posts = get_draft_subpages();
 
diff --git a/system/admin/views/edit-page.html.php b/system/admin/views/edit-page.html.php
index 6c3da74..e0f0e26 100644
--- a/system/admin/views/edit-page.html.php
+++ b/system/admin/views/edit-page.html.php
@@ -118,7 +118,7 @@ $images = get_gallery();
                         <input type="submit" name="submit" class="btn btn-primary submit" value="<?php echo i18n('Save_category');?>"/>
                     <?php } else {?>
                         <input type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/>
-                        <?php $count = count(get_static_sub_post($oldmd)); ?>
+                        <?php $count = count(find_subpage($oldmd)); ?>
                         <?php if (stripos($dir . '/', '/draft/') !== false) { ?>
                         <input type="submit" name="publishdraft" class="btn btn-primary submit" value="<?php echo i18n('Publish_draft');?>"/> <input type="submit" name="updatedraft" class="btn btn-primary draft" value="<?php echo i18n('Update_draft');?>"/> <?php if ($count == 0 && $type != 'is_page'):?><a class="btn btn-danger" href="<?php echo $delete ?>"><?php echo i18n('Delete');?></a><?php endif;?>        
                         
diff --git a/system/admin/views/static-pages.html.php b/system/admin/views/static-pages.html.php
index 567b4c8..c2aaef7 100644
--- a/system/admin/views/static-pages.html.php
+++ b/system/admin/views/static-pages.html.php
@@ -4,7 +4,7 @@
 <a class="btn btn-primary right" href="<?php echo site_url();?>add/page"><?php echo i18n('Add_new_page');?></a>
 <br><br>
 <?php if (isset($_SESSION[config("site.url")]['user'])):?>
-    <?php $posts = get_static_post();
+    <?php $posts = find_page();
     if (!empty($posts)): ?>
         <table class="table post-list">
         <tr class="head">
@@ -25,7 +25,7 @@
 				<td><a class="btn btn-primary btn-xs" href="<?php echo $p->url;?>/add?destination=admin/pages"><?php echo i18n('Add_sub');?></a> <a class="btn btn-primary btn-xs" href="<?php echo $p->url;?>/edit?destination=admin/pages"><?php echo i18n('Edit');?></a> <?php if ($count == 0):?><a class="btn btn-danger btn-xs" href="<?php echo $p->url;?>/delete?destination=admin/pages"><?php echo i18n('Delete');?></a><?php endif;?></td>
 				<td>
 					<table>
-						<?php $subPages = get_static_sub_post($p->md);
+						<?php $subPages = find_subpage($p->md);
 						foreach ($subPages as $sp):?>
 														
 						<div class="row">
diff --git a/system/admin/views/user-draft.html.php b/system/admin/views/user-draft.html.php
index 41a76db..37aefea 100644
--- a/system/admin/views/user-draft.html.php
+++ b/system/admin/views/user-draft.html.php
@@ -55,7 +55,7 @@
             <th><?php echo i18n('Operations');?></th>
         </tr>
         <?php foreach ($draftPages as $d): ?>
-		<?php $count = count(get_static_sub_post($d->md)); ?>
+		<?php $count = count(find_subpage($d->md)); ?>
             <tr>
                 <td><?php echo $d->title ?></td>
                 <td><?php echo format_date($d->lastMod) ?></td>
@@ -77,7 +77,7 @@
 			<th><?php echo i18n('Static_pages');?></th>
         </tr>
         <?php foreach ($draftSubpages as $sp): ?>
-		<?php $parent = get_static_post($sp->parent);?>
+		<?php $parent = find_page($sp->parent);?>
             <tr>
                 <td><?php echo $sp->title ?></td>
                 <td><?php echo format_date($sp->lastMod) ?></td>
diff --git a/system/htmly.php b/system/htmly.php
index 47a092d..94e2857 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -938,9 +938,9 @@ get('/admin/draft', function () {
 
         $posts = get_draft($name, $page, $perpage);
         
-        $draftPages = find_draft_pages();
+        $draftPages = find_draft_page();
         
-        $draftSubpages = find_draft_subpages();
+        $draftSubpages = find_draft_subpage();
 
         $total = get_draftcount($name);
 
@@ -2864,7 +2864,7 @@ get('/:static', function ($static) {
             }
         }
 
-        $post = get_static_post($static);
+        $post = find_page($static);
         
         if (array_key_exists('prev', $post)) {
             $prev = $post['prev'];
@@ -2933,7 +2933,7 @@ get('/:static/add', function ($static) {
 
         config('views.root', 'system/admin/views');
 
-        $post = get_static_post($static);
+        $post = find_page($static);
 
         if (!$post) {
             not_found();
@@ -3007,10 +3007,10 @@ get('/:static/edit', function ($static) {
     if (login()) {
 
         config('views.root', 'system/admin/views');
-        $post = get_static_post($static);
+        $post = find_page($static);
 
         if (!$post) {
-            $post = find_draft_pages($static);
+            $post = find_draft_page($static);
             if (!$post) {
                 not_found();
             } else {
@@ -3096,10 +3096,10 @@ get('/:static/delete', function ($static) {
     if (login()) {
 
         config('views.root', 'system/admin/views');
-        $post = get_static_post($static);
+        $post = find_page($static);
 
         if (!$post) {
-            $post = find_draft_pages($static);
+            $post = find_draft_page($static);
             if (!$post) {
                 not_found();
             } else {
@@ -3151,11 +3151,11 @@ get('/:static/:sub', function ($static, $sub) {
         header("location: $redir", TRUE, 301);
     }
 
-    $parent_post = get_static_post($static);
+    $parent_post = find_page($static);
     if (!$parent_post) {
         not_found();
     }
-    $post = get_static_sub_post($static, $sub);
+    $post = find_subpage($static, $sub);
     
     if (array_key_exists('prev', $post)) {
         $prev = $post['prev'];
@@ -3228,7 +3228,7 @@ get('/:static/:sub/edit', function ($static, $sub) {
     if (login()) {
 
         config('views.root', 'system/admin/views');
-        $post = get_static_post($static);
+        $post = find_page($static);
 
         if (!$post) {
             not_found();
@@ -3236,10 +3236,10 @@ get('/:static/:sub/edit', function ($static, $sub) {
 
         $post = $post['current'];
 
-        $page = get_static_sub_post($static, $sub);
+        $page = find_subpage($static, $sub);
 
         if (!$page) {
-            $page = find_draft_subpages($static, $sub);
+            $page = find_draft_subpage($static, $sub);
             if (!$page) {
                 not_found();
             } else {
@@ -3330,7 +3330,7 @@ get('/:static/:sub/delete', function ($static, $sub) {
     if (login()) {
 
         config('views.root', 'system/admin/views');
-        $post = get_static_post($static);
+        $post = find_page($static);
 
         if (!$post) {
             not_found();
@@ -3338,10 +3338,10 @@ get('/:static/:sub/delete', function ($static, $sub) {
 
         $post = $post['current'];
 
-        $page = get_static_sub_post($static, $sub);
+        $page = find_subpage($static, $sub);
 
         if (!$page) {
-            $page = find_draft_subpages($static, $sub);
+            $page = find_draft_subpage($static, $sub);
             if (!$page) {
                 not_found();
             } else {
diff --git a/system/includes/functions.php b/system/includes/functions.php
index da0f077..ed823b3 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -1083,7 +1083,7 @@ function default_profile($name)
 }
 
 // Return static page.
-function get_static_post($static = null)
+function find_page($static = null)
 {
     $pages = get_static_pages();
     
@@ -1165,8 +1165,8 @@ function get_static_post($static = null)
     return $tmp;
 }
 
-// Return static page.
-function get_static_sub_post($static, $sub_static = null)
+// Return static subpage.
+function find_subpage($static, $sub_static = null)
 {
     $sub_pages = array_values(get_static_subpages($static));