diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
index 1a9f0e6a4d..039956d745 100644
--- a/modules/comment/controllers/admin_comments.php
+++ b/modules/comment/controllers/admin_comments.php
@@ -48,7 +48,7 @@ public function queue($state) {
     $view->content->menu = $this->_menu($view->content->counts);
     $view->content->state = $state;
     $view->content->comments = ORM::factory("comment")
-      ->orderby("created", "DESC")
+      ->order_by("created", "DESC")
       ->where("state", $state)
       ->limit(self::$items_per_page, ($page - 1) * self::$items_per_page)
       ->find_all();
diff --git a/modules/comment/helpers/comment_block.php b/modules/comment/helpers/comment_block.php
index 7cd5d429ca..ab86b90aad 100644
--- a/modules/comment/helpers/comment_block.php
+++ b/modules/comment/helpers/comment_block.php
@@ -30,7 +30,7 @@ static function get($block_id) {
       $block->title = t("Recent comments");
       $block->content = new View("admin_block_recent_comments.html");
       $block->content->comments =
-        ORM::factory("comment")->orderby("created", "DESC")->limit(5)->find_all();
+        ORM::factory("comment")->order_by("created", "DESC")->limit(5)->find_all();
       break;
     }
 
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index 3692a30de1..d0bb785974 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -36,7 +36,7 @@ static function feed($feed_id, $offset, $limit, $id) {
     $comments = ORM::factory("comment")
       ->viewable()
       ->where("state", "published")
-      ->orderby("created", "DESC");
+      ->order_by("created", "DESC");
 
     if ($feed_id == "item") {
       $comments->where("item_id", $id);
diff --git a/modules/comment/helpers/comment_theme.php b/modules/comment/helpers/comment_theme.php
index af0e1ca42e..2f12192baa 100644
--- a/modules/comment/helpers/comment_theme.php
+++ b/modules/comment/helpers/comment_theme.php
@@ -39,7 +39,7 @@ static function photo_bottom($theme) {
     $view->comments = ORM::factory("comment")
       ->where("item_id", $theme->item()->id)
       ->where("state", "published")
-      ->orderby("created", "ASC")
+      ->order_by("created", "ASC")
       ->find_all();
 
     $block->content = $view;
diff --git a/modules/gallery/controllers/admin_advanced_settings.php b/modules/gallery/controllers/admin_advanced_settings.php
index 79bc1183fa..c9de7e5741 100644
--- a/modules/gallery/controllers/admin_advanced_settings.php
+++ b/modules/gallery/controllers/admin_advanced_settings.php
@@ -22,7 +22,7 @@ public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_advanced_settings.html");
     $view->content->vars = ORM::factory("var")
-      ->orderby("module_name", "name")
+      ->order_by("module_name", "name")
       ->find_all();
     print $view;
   }
diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index fe5059e7d2..3b896553f2 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -41,9 +41,9 @@ public function index() {
     $view->content = new View("admin_maintenance.html");
     $view->content->task_definitions = task::get_definitions();
     $view->content->running_tasks = ORM::factory("task")
-      ->where("done", 0)->orderby("updated", "DESC")->find_all();
+      ->where("done", 0)->order_by("updated", "DESC")->find_all();
     $view->content->finished_tasks = ORM::factory("task")
-      ->where("done", 1)->orderby("updated", "DESC")->find_all();
+      ->where("done", 1)->order_by("updated", "DESC")->find_all();
     print $view;
   }
 
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
index 9d27181af1..d0200a7346 100644
--- a/modules/gallery/helpers/access.php
+++ b/modules/gallery/helpers/access.php
@@ -171,7 +171,7 @@ static function locked_by($group, $perm_name, $item) {
       ->where("items.id <> $item->id")
       ->join("access_intents", "items.id", "access_intents.item_id")
       ->where("access_intents.view_$group->id", self::DENY)
-      ->orderby("level", "DESC")
+      ->order_by("level", "DESC")
       ->limit(1)
       ->find();
 
@@ -494,7 +494,7 @@ private static function _update_access_view_cache($group, $item) {
         ->where("right_ptr >", $item->right_ptr)
         ->join("access_intents", "access_intents.item_id", "items.id")
         ->where("access_intents.$field", self::DENY)
-        ->orderby("left_ptr", "DESC")
+        ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
       if ($tmp_item->loaded()) {
@@ -516,7 +516,7 @@ private static function _update_access_view_cache($group, $item) {
       ->where("right_ptr <=", $item->right_ptr)
       ->where("type", "album")
       ->where("access_intents.$field IS NOT", self::INHERIT)
-      ->orderby("level", "DESC")
+      ->order_by("level", "DESC")
       ->find_all();
     foreach ($query as $row) {
       if ($row->$field == self::ALLOW) {
@@ -565,7 +565,7 @@ private static function _update_access_non_view_cache($group, $perm_name, $item)
         ->where("left_ptr <", $item->left_ptr)
         ->where("right_ptr >", $item->right_ptr)
         ->where("$field IS NOT", self::UNKNOWN)
-        ->orderby("left_ptr", "DESC")
+        ->order_by("left_ptr", "DESC")
         ->limit(1)
         ->find();
       if ($tmp_item->loaded()) {
@@ -581,7 +581,7 @@ private static function _update_access_non_view_cache($group, $perm_name, $item)
       ->where("left_ptr >=", $item->left_ptr)
       ->where("right_ptr <=", $item->right_ptr)
       ->where("$field IS NOT", self::INHERIT)
-      ->orderby("level", "ASC")
+      ->order_by("level", "ASC")
       ->find_all();
     foreach  ($query as $row) {
       $value = ($row->$field === self::ALLOW) ? "TRUE" : "FALSE";
diff --git a/modules/gallery/helpers/gallery_block.php b/modules/gallery/helpers/gallery_block.php
index b5c32ad299..d09f1c80da 100644
--- a/modules/gallery/helpers/gallery_block.php
+++ b/modules/gallery/helpers/gallery_block.php
@@ -46,7 +46,7 @@ static function get($block_id) {
       $block->title = t("Photo stream");
       $block->content = new View("admin_block_photo_stream.html");
       $block->content->photos =
-        ORM::factory("item")->where("type", "photo")->orderby("created", "DESC")->find_all(10);
+        ORM::factory("item")->where("type", "photo")->order_by("created", "DESC")->find_all(10);
       break;
 
     case "log_entries":
@@ -54,7 +54,7 @@ static function get($block_id) {
       $block->title = t("Log entries");
       $block->content = new View("admin_block_log_entries.html");
       $block->content->entries = ORM::factory("log")
-        ->orderby(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
+        ->order_by(array("timestamp" => "DESC", "id" => "DESC"))->find_all(5);
       break;
 
     case "stats":
diff --git a/modules/gallery/helpers/gallery_rss.php b/modules/gallery/helpers/gallery_rss.php
index 155edfb552..e195be8d2e 100644
--- a/modules/gallery/helpers/gallery_rss.php
+++ b/modules/gallery/helpers/gallery_rss.php
@@ -30,13 +30,13 @@ static function feed($feed_id, $offset, $limit, $id) {
       $feed->children = ORM::factory("item")
         ->viewable()
         ->where("type !=", "album")
-        ->orderby("created", "DESC")
+        ->order_by("created", "DESC")
         ->find_all($limit, $offset);
 
       $all_children = ORM::factory("item")
         ->viewable()
         ->where("type !=", "album")
-        ->orderby("created", "DESC");
+        ->order_by("created", "DESC");
 
       $feed->max_pages = ceil($all_children->find_all()->count() / $limit);
       $feed->title = t("Recent updates");
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index a78cadd0b1..aef090036d 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -183,7 +183,7 @@ private static function _get_rules($target) {
       foreach (ORM::factory("graphics_rule")
                ->where("target", $target)
                ->where("active", true)
-               ->orderby("priority", "asc")
+               ->order_by("priority", "asc")
                ->find_all() as $rule) {
         $rules[] = (object)$rule->as_array();
       }
diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 109fa6f88b..7496d368f4 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -142,7 +142,7 @@ static function get_max_weight() {
     // @todo: figure out a better way to bootstrap the weight.
     $result = Database::instance()
       ->select("weight")->from("items")
-      ->orderby("weight", "desc")->limit(1)
+      ->order_by("weight", "desc")->limit(1)
       ->get()->current();
     return ($result ? $result->weight : 0) + 1;
   }
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index e54a4352e8..b7e13b9ab5 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -364,7 +364,7 @@ static function get_var($module_name, $name, $default_value=null) {
         foreach (Database::instance()
                  ->select("module_name", "name", "value")
                  ->from("vars")
-                 ->orderby("module_name", "name")
+                 ->order_by("module_name", "name")
                  ->get() as $row) {
           if ($row->module_name == "gallery" && $row->name == "_cache") {
             // This could happen if there's a race condition
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index bd1f9af58d..1efac37f61 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -291,7 +291,7 @@ private function _build_relative_caches() {
              ->where("left_ptr <=", $this->left_ptr)
              ->where("right_ptr >=", $this->right_ptr)
              ->where("id <>", 1)
-             ->orderby("left_ptr", "ASC")
+             ->order_by("left_ptr", "ASC")
              ->get() as $row) {
       // Don't encode the names segment
       $names[] = rawurlencode($row->name);
@@ -460,7 +460,7 @@ public function get_position($child, $where=array()) {
                ->where("parent_id", $this->id)
                ->where($sort_column, $child->$sort_column)
                ->where($where)
-               ->orderby(array("id" => "ASC"))
+               ->order_by(array("id" => "ASC"))
                ->get() as $row) {
         $position++;
         if ($row->id == $child->id) {
@@ -475,10 +475,10 @@ public function get_position($child, $where=array()) {
       //
       // Reproduce the children() functionality here using Database directly to avoid loading the
       // whole ORM for each row.
-      $orderby = array($this->sort_column => $this->sort_order);
+      $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
       if ($this->sort_column != "id") {
-        $orderby["id"] = "ASC";
+        $order_by["id"] = "ASC";
       }
 
       $position = 0;
@@ -486,7 +486,7 @@ public function get_position($child, $where=array()) {
                ->from("items")
                ->where("parent_id", $this->id)
                ->where($where)
-               ->orderby($orderby)
+               ->order_by($order_by)
                ->get() as $row) {
         $position++;
         if ($row->id == $child->id) {
@@ -592,18 +592,18 @@ public function movie_img($extra_attrs) {
    * @param   integer  SQL limit
    * @param   integer  SQL offset
    * @param   array    additional where clauses
-   * @param   array    orderby
+   * @param   array    order_by
    * @return array ORM
    */
-  function children($limit=null, $offset=0, $where=array(), $orderby=null) {
-    if (empty($orderby)) {
-      $orderby = array($this->sort_column => $this->sort_order);
+  function children($limit=null, $offset=0, $where=array(), $order_by=null) {
+    if (empty($order_by)) {
+      $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
       if ($this->sort_column != "id") {
-        $orderby["id"] = "ASC";
+        $order_by["id"] = "ASC";
       }
     }
-    return parent::children($limit, $offset, $where, $orderby);
+    return parent::children($limit, $offset, $where, $order_by);
   }
 
   /**
@@ -617,14 +617,14 @@ function children($limit=null, $offset=0, $where=array(), $orderby=null) {
    * @param   array    additional where clauses
    * @return object ORM_Iterator
    */
-  function descendants($limit=null, $offset=0, $where=array(), $orderby=null) {
-    if (empty($orderby)) {
-      $orderby = array($this->sort_column => $this->sort_order);
+  function descendants($limit=null, $offset=0, $where=array(), $order_by=null) {
+    if (empty($order_by)) {
+      $order_by = array($this->sort_column => $this->sort_order);
       // Use id as a tie breaker
       if ($this->sort_column != "id") {
-        $orderby["id"] = "ASC";
+        $order_by["id"] = "ASC";
       }
     }
-    return parent::descendants($limit, $offset, $where, $orderby);
+    return parent::descendants($limit, $offset, $where, $order_by);
   }
 }
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index 2596112916..053a189112 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -199,7 +199,7 @@ static function add($task) {
       $entries = ORM::factory("server_add_file")
         ->where("task_id", $task->id)
         ->where("item_id", null)
-        ->orderby("id", "ASC")
+        ->order_by("id", "ASC")
         ->limit(10)
         ->find_all();
       if ($entries->count() == 0) {
diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php
index 93b5181489..aff4480340 100644
--- a/modules/tag/controllers/admin_tags.php
+++ b/modules/tag/controllers/admin_tags.php
@@ -29,7 +29,7 @@ public function index() {
     if ($filter) {
       $query->like("name", $filter);
     }
-    $view->content->tags = $query->orderby("name", "ASC")->find_all();
+    $view->content->tags = $query->order_by("name", "ASC")->find_all();
     print $view;
   }
 
diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php
index 9f9e45d9dc..dfa3a9b3a9 100644
--- a/modules/tag/controllers/tags.php
+++ b/modules/tag/controllers/tags.php
@@ -84,7 +84,7 @@ public function autocomplete() {
     $tag_part = end($tag_parts);
     $tag_list = ORM::factory("tag")
       ->like("name", "{$tag_part}%", false)
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->limit($limit)
       ->find_all();
     foreach ($tag_list as $tag) {
diff --git a/modules/user/controllers/admin_users.php b/modules/user/controllers/admin_users.php
index 619e6e18fd..ee65efd274 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/user/controllers/admin_users.php
@@ -22,10 +22,10 @@ public function index() {
     $view = new Admin_View("admin.html");
     $view->content = new View("admin_users.html");
     $view->content->users = ORM::factory("user")
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->find_all();
     $view->content->groups = ORM::factory("group")
-      ->orderby("name", "ASC")
+      ->order_by("name", "ASC")
       ->find_all();
     print $view;
   }