diff --git a/public_html/templates/help.tpl b/public_html/templates/help.tpl
index 2e89d25f..537404fe 100644
--- a/public_html/templates/help.tpl
+++ b/public_html/templates/help.tpl
@@ -165,9 +165,9 @@
                 var table = [
                     {search: 'order:random', description: 'as random as it can get'},
                     {search: 'order:id', description: 'highest to lowest post ID (default browse view)'},
-                    {search: 'order:date', description: 'newest to oldest (pretty much same as above)'},
-                    {search: '-order:date', description: 'oldest to newest'},
-                    {search: 'order:date,asc', description: 'oldest to newest (ascending order, default = descending)'},
+                    {search: 'order:edit_date', description: 'newest to oldest (pretty much same as above)'},
+                    {search: '-order:edit_date', description: 'oldest to newest'},
+                    {search: 'order:edit_date,asc', description: 'oldest to newest (ascending order, default = descending)'},
                     {search: 'order:score', description: 'highest scored'},
                     {search: 'order:file_size', description: 'largest files first'},
                     {search: 'order:tag_count', description: 'with most tags'},
@@ -188,9 +188,9 @@
     </table>
 
     <p>As shown with <a
-    href="#/posts/query=-order:date"><code>-order:date</code></a>, any of them
-    can be reversed in the same way as negating other tags: by placing a dash
-    before the tag.</p>
+    href="#/posts/query=-order:edit_date"><code>-order:edit_date</code></a>,
+    any of them can be reversed in the same way as negating other tags: by
+    placing a dash before the tag.</p>
 </div>
 
 <div data-tab="comments">
diff --git a/public_html/templates/home.tpl b/public_html/templates/home.tpl
index 1652a2a4..6e8c7d48 100644
--- a/public_html/templates/home.tpl
+++ b/public_html/templates/home.tpl
@@ -43,7 +43,7 @@
                     <% } %>
 
                     uploaded
-                    <%= util.formatRelativeTime(post.uploadTime) %>
+                    <%= util.formatRelativeTime(post.creationTime) %>
                     by
                     <% showUser(post.user.name) %>
                 </span>
diff --git a/public_html/templates/post.tpl b/public_html/templates/post.tpl
index 48218a97..fcfccd35 100644
--- a/public_html/templates/post.tpl
+++ b/public_html/templates/post.tpl
@@ -120,8 +120,8 @@ if (forceHttpInPermalinks > 0) {
 
                 <br/>
 
-                <span class="date" title="<%= util.formatAbsoluteTime(post.uploadTime) %>">
-                    <%= util.formatRelativeTime(post.uploadTime) %>
+                <span class="date" title="<%= util.formatAbsoluteTime(post.creationTime) %>">
+                    <%= util.formatRelativeTime(post.creationTime) %>
                 </span>
             </div>
 
@@ -147,7 +147,7 @@ if (forceHttpInPermalinks > 0) {
                     </li>
                 <% } %>
 
-                <% if (post.lastEditTime !== post.uploadTime) { %>
+                <% if (post.lastEditTime !== post.creationTime) { %>
                     <li>
                         Edited:
                         <span title="<%= util.formatAbsoluteTime(post.lastEditTime) %>">
diff --git a/public_html/templates/user-list-item.tpl b/public_html/templates/user-list-item.tpl
index bfd6a056..5a0421f2 100644
--- a/public_html/templates/user-list-item.tpl
+++ b/public_html/templates/user-list-item.tpl
@@ -19,8 +19,8 @@
                 <%= user.name %>
             <% } %>
         </h1>
-        <div class="date-joined" title="<%= util.formatAbsoluteTime(user.registrationTime) %>">
-            Joined: <%= util.formatRelativeTime(user.registrationTime) %>
+        <div class="date-joined" title="<%= util.formatAbsoluteTime(user.creationTime) %>">
+            Joined: <%= util.formatRelativeTime(user.creationTime) %>
         </div>
         <div class="date-seen" title="<%= util.formatAbsoluteTime(user.lastLoginTime) %>">
             Last seen: <%= util.formatRelativeTime(user.lastLoginTime) %>
diff --git a/public_html/templates/user.tpl b/public_html/templates/user.tpl
index e5967152..44c658f3 100644
--- a/public_html/templates/user.tpl
+++ b/public_html/templates/user.tpl
@@ -51,8 +51,8 @@
         <table>
             <tr>
                 <td>Registered:</td>
-                <td title="<%= util.formatAbsoluteTime(user.registrationTime) %>">
-                    <%= util.formatRelativeTime(user.registrationTime) %>
+                <td title="<%= util.formatAbsoluteTime(user.creationTime) %>">
+                    <%= util.formatRelativeTime(user.creationTime) %>
                 </td>
             </tr>
 
diff --git a/src/Dao/EntityConverters/PostEntityConverter.php b/src/Dao/EntityConverters/PostEntityConverter.php
index 532d78e0..c1c1f546 100644
--- a/src/Dao/EntityConverters/PostEntityConverter.php
+++ b/src/Dao/EntityConverters/PostEntityConverter.php
@@ -11,7 +11,7 @@ class PostEntityConverter extends AbstractEntityConverter implements IEntityConv
         [
             'name' => $entity->getName(),
             'userId' => $entity->getUserId(),
-            'uploadTime' => $this->entityTimeToDbTime($entity->getUploadTime()),
+            'creationTime' => $this->entityTimeToDbTime($entity->getCreationTime()),
             'lastEditTime' => $this->entityTimeToDbTime($entity->getLastEditTime()),
             'safety' => $entity->getSafety(),
             'contentType' => $entity->getContentType(),
@@ -33,7 +33,7 @@ class PostEntityConverter extends AbstractEntityConverter implements IEntityConv
         $entity = new Post(intval($array['id']));
         $entity->setName($array['name']);
         $entity->setUserId($array['userId']);
-        $entity->setUploadTime($this->dbTimeToEntityTime($array['uploadTime']));
+        $entity->setCreationTime($this->dbTimeToEntityTime($array['creationTime']));
         $entity->setLastEditTime($this->dbTimeToEntityTime($array['lastEditTime']));
         $entity->setSafety(intval($array['safety']));
         $entity->setContentType(intval($array['contentType']));
diff --git a/src/Dao/EntityConverters/UserEntityConverter.php b/src/Dao/EntityConverters/UserEntityConverter.php
index a385299d..e9f2e0ee 100644
--- a/src/Dao/EntityConverters/UserEntityConverter.php
+++ b/src/Dao/EntityConverters/UserEntityConverter.php
@@ -15,7 +15,7 @@ class UserEntityConverter extends AbstractEntityConverter implements IEntityConv
             'passwordHash' => $entity->getPasswordHash(),
             'passwordSalt' => $entity->getPasswordSalt(),
             'accessRank' => $entity->getAccessRank(),
-            'registrationTime' => $this->entityTimeToDbTime($entity->getRegistrationTime()),
+            'creationTime' => $this->entityTimeToDbTime($entity->getCreationTime()),
             'lastLoginTime' => $this->entityTimeToDbTime($entity->getLastLoginTime()),
             'avatarStyle' => $entity->getAvatarStyle(),
             'browsingSettings' => json_encode($entity->getBrowsingSettings()),
@@ -33,7 +33,7 @@ class UserEntityConverter extends AbstractEntityConverter implements IEntityConv
         $entity->setPasswordHash($array['passwordHash']);
         $entity->setPasswordSalt($array['passwordSalt']);
         $entity->setAccessRank(intval($array['accessRank']));
-        $entity->setRegistrationTime($this->dbTimeToEntityTime($array['registrationTime']));
+        $entity->setCreationTime($this->dbTimeToEntityTime($array['creationTime']));
         $entity->setLastLoginTime($this->dbTimeToEntityTime($array['lastLoginTime']));
         $entity->setAvatarStyle(intval($array['avatarStyle']));
         $entity->setBrowsingSettings(json_decode($array['browsingSettings']));
diff --git a/src/Dao/UserDao.php b/src/Dao/UserDao.php
index 7313c386..70f2d519 100644
--- a/src/Dao/UserDao.php
+++ b/src/Dao/UserDao.php
@@ -10,7 +10,7 @@ use Szurubooru\Services\ThumbnailService;
 class UserDao extends AbstractDao implements ICrudDao
 {
     const ORDER_NAME = 'name';
-    const ORDER_REGISTRATION_TIME = 'registrationTime';
+    const ORDER_CREATION_TIME = 'creationTime';
 
     private $fileDao;
     private $thumbnailService;
diff --git a/src/Entities/Post.php b/src/Entities/Post.php
index a8d0cad5..2b616cab 100644
--- a/src/Entities/Post.php
+++ b/src/Entities/Post.php
@@ -29,7 +29,7 @@ final class Post extends Entity
 
     private $name;
     private $userId;
-    private $uploadTime;
+    private $creationTime;
     private $lastEditTime;
     private $safety;
     private $contentType;
@@ -79,14 +79,14 @@ final class Post extends Entity
         $this->safety = $safety;
     }
 
-    public function getUploadTime()
+    public function getCreationTime()
     {
-        return $this->uploadTime;
+        return $this->creationTime;
     }
 
-    public function setUploadTime($uploadTime)
+    public function setCreationTime($creationTime)
     {
-        $this->uploadTime = $uploadTime;
+        $this->creationTime = $creationTime;
     }
 
     public function getLastEditTime()
diff --git a/src/Entities/User.php b/src/Entities/User.php
index 4074677d..705e4581 100644
--- a/src/Entities/User.php
+++ b/src/Entities/User.php
@@ -23,7 +23,7 @@ final class User extends Entity
     private $passwordHash;
     private $passwordSalt;
     private $accessRank;
-    private $registrationTime;
+    private $creationTime;
     private $lastLoginTime;
     private $avatarStyle;
     private $browsingSettings;
@@ -110,14 +110,14 @@ final class User extends Entity
         $this->accessRank = $accessRank;
     }
 
-    public function getRegistrationTime()
+    public function getCreationTime()
     {
-        return $this->registrationTime;
+        return $this->creationTime;
     }
 
-    public function setRegistrationTime($registrationTime)
+    public function setCreationTime($creationTime)
     {
-        $this->registrationTime = $registrationTime;
+        $this->creationTime = $creationTime;
     }
 
     public function getLastLoginTime()
diff --git a/src/Search/Filters/PostFilter.php b/src/Search/Filters/PostFilter.php
index 63d3f13d..a77eae16 100644
--- a/src/Search/Filters/PostFilter.php
+++ b/src/Search/Filters/PostFilter.php
@@ -18,7 +18,7 @@ class PostFilter extends BasicFilter implements IFilter
 
     const REQUIREMENT_TAG = 'tag';
     const REQUIREMENT_ID = 'id';
-    const REQUIREMENT_DATE = 'uploadTime';
+    const REQUIREMENT_CREATION_TIME = 'creationTime';
     const REQUIREMENT_HASH = 'name';
     const REQUIREMENT_TAG_COUNT = 'tagCount';
     const REQUIREMENT_FAV_COUNT = 'favCount';
diff --git a/src/Search/Filters/UserFilter.php b/src/Search/Filters/UserFilter.php
index 40569387..a57c6048 100644
--- a/src/Search/Filters/UserFilter.php
+++ b/src/Search/Filters/UserFilter.php
@@ -4,7 +4,7 @@ namespace Szurubooru\Search\Filters;
 class UserFilter extends BasicFilter implements IFilter
 {
     const ORDER_NAME = 'name';
-    const ORDER_REGISTRATION_TIME = 'registrationTime';
+    const ORDER_CREATION_TIME = 'creationTime';
 
     public function __construct()
     {
diff --git a/src/Search/Parsers/PostSearchParser.php b/src/Search/Parsers/PostSearchParser.php
index 41c3dd51..b6cb5a02 100644
--- a/src/Search/Parsers/PostSearchParser.php
+++ b/src/Search/Parsers/PostSearchParser.php
@@ -119,7 +119,7 @@ class PostSearchParser extends AbstractSearchParser
         [
             [['id'],                                    PostFilter::ORDER_ID],
             [['random'],                                PostFilter::ORDER_RANDOM],
-            [['time', 'date'],                          PostFilter::ORDER_LAST_EDIT_TIME],
+            [['edit_time', 'edit_date'],                PostFilter::ORDER_LAST_EDIT_TIME],
             [['score'],                                 PostFilter::ORDER_SCORE],
             [['file_size'],                             PostFilter::ORDER_FILE_SIZE],
             [['tag_count', 'tags', 'tag'],              PostFilter::ORDER_TAG_COUNT],
@@ -205,7 +205,7 @@ class PostSearchParser extends AbstractSearchParser
         $this->addRequirementFromToken(
             $filter,
             $token,
-            PostFilter::REQUIREMENT_DATE,
+            PostFilter::REQUIREMENT_CREATION_TIME,
             self::ALLOW_RANGES);
     }
 
diff --git a/src/Search/Parsers/UserSearchParser.php b/src/Search/Parsers/UserSearchParser.php
index 34cbf27d..86aa0ac2 100644
--- a/src/Search/Parsers/UserSearchParser.php
+++ b/src/Search/Parsers/UserSearchParser.php
@@ -28,7 +28,7 @@ class UserSearchParser extends AbstractSearchParser
         return
         [
             [['name'], UserFilter::ORDER_NAME],
-            [['registration_time', 'registration_date'], UserFilter::ORDER_REGISTRATION_TIME],
+            [['creation_time', 'creation_date'], UserFilter::ORDER_CREATION_TIME],
         ];
     }
 }
diff --git a/src/Services/PostService.php b/src/Services/PostService.php
index 6141bd2b..3fdd28ef 100644
--- a/src/Services/PostService.php
+++ b/src/Services/PostService.php
@@ -113,7 +113,7 @@ class PostService
                 $this->authService->loginAnonymous();
 
             $post = new Post();
-            $post->setUploadTime($this->timeService->getCurrentTime());
+            $post->setCreationTime($this->timeService->getCurrentTime());
             $post->setLastEditTime($this->timeService->getCurrentTime());
             $post->setUser($this->authService->getLoggedInUser());
             $post->setOriginalFileName($formData->contentFileName);
diff --git a/src/Services/UserService.php b/src/Services/UserService.php
index 6d991413..25454125 100644
--- a/src/Services/UserService.php
+++ b/src/Services/UserService.php
@@ -104,7 +104,7 @@ class UserService
             $formData->validate($this->validator);
 
             $user = new User();
-            $user->setRegistrationTime($this->timeService->getCurrentTime());
+            $user->setCreationTime($this->timeService->getCurrentTime());
             $user->setLastLoginTime(null);
             $user->setAccessRank($this->userDao->hasAnyUsers()
                 ? $this->getDefaultAccessRank()
diff --git a/src/Upgrades/Upgrade43.php b/src/Upgrades/Upgrade43.php
new file mode 100644
index 00000000..497749a2
--- /dev/null
+++ b/src/Upgrades/Upgrade43.php
@@ -0,0 +1,13 @@
+<?php
+namespace Szurubooru\Upgrades;
+use Szurubooru\DatabaseConnection;
+
+class Upgrade43 implements IUpgrade
+{
+    public function run(DatabaseConnection $databaseConnection)
+    {
+        $pdo = $databaseConnection->getPDO();
+        $pdo->exec('ALTER TABLE posts CHANGE COLUMN uploadTime creationTime TIMESTAMP NOT NULL DEFAULT 0');
+        $pdo->exec('ALTER TABLE users CHANGE COLUMN registrationTime creationTime TIMESTAMP NOT NULL DEFAULT 0');
+    }
+}
diff --git a/src/ViewProxies/PostViewProxy.php b/src/ViewProxies/PostViewProxy.php
index 0ae5029a..077f655e 100644
--- a/src/ViewProxies/PostViewProxy.php
+++ b/src/ViewProxies/PostViewProxy.php
@@ -65,7 +65,7 @@ class PostViewProxy extends AbstractViewProxy
         $result->id = $post->getId();
         $result->idMarkdown = $post->getIdMarkdown();
         $result->name = $post->getName();
-        $result->uploadTime = $post->getUploadTime();
+        $result->creationTime = $post->getCreationTime();
         $result->lastEditTime = $post->getLastEditTime();
         $result->safety = EnumHelper::postSafetyToString($post->getSafety());
         $result->contentType = EnumHelper::postTypeToString($post->getContentType());
diff --git a/src/ViewProxies/UserViewProxy.php b/src/ViewProxies/UserViewProxy.php
index 3de68d8a..59539714 100644
--- a/src/ViewProxies/UserViewProxy.php
+++ b/src/ViewProxies/UserViewProxy.php
@@ -20,7 +20,7 @@ class UserViewProxy extends AbstractViewProxy
         {
             $result->id = $user->getId();
             $result->name = $user->getName();
-            $result->registrationTime = $user->getRegistrationTime();
+            $result->creationTime = $user->getCreationTime();
             $result->lastLoginTime = $user->getLastLoginTime();
             $result->avatarStyle = EnumHelper::avatarStyleToString($user->getAvatarStyle());
             $result->banned = $user->isBanned();
diff --git a/src/di.php b/src/di.php
index c367a806..f7c50253 100644
--- a/src/di.php
+++ b/src/di.php
@@ -59,6 +59,7 @@ return [
             $container->get(\Szurubooru\Upgrades\Upgrade40::class),
             $container->get(\Szurubooru\Upgrades\Upgrade41::class),
             $container->get(\Szurubooru\Upgrades\Upgrade42::class),
+            $container->get(\Szurubooru\Upgrades\Upgrade43::class),
         ];
     }),