diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 9406f5d9..10bad0b2 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -395,7 +395,7 @@ class Item_Model extends ORM_MPTT {
    * @param boolean (optional) $center_vertically Center vertically (default: false)
    * @return string
    */
-  public function thumb_tag($extra_attrs=array(), $max=null, $center_vertically=false) {
+  public function thumb_img($extra_attrs=array(), $max=null, $center_vertically=false) {
     list ($height, $width) = $this->scale_dimensions($max);
     if ($center_vertically && $max) {
       // The constant is divide by 2 to calculate the file and 10 to convert to em
@@ -448,7 +448,7 @@ class Item_Model extends ORM_MPTT {
    * @param array $extra_attrs  Extra attributes to add to the img tag
    * @return string
    */
-  public function resize_tag($extra_attrs) {
+  public function resize_img($extra_attrs) {
     $attrs = array_merge($extra_attrs,
             array("src" => $this->resize_url(),
               "alt" => $this->title,
@@ -464,7 +464,7 @@ class Item_Model extends ORM_MPTT {
    * @param array $extra_attrs
    * @return string
    */
-  public function movie_tag($extra_attrs) {
+  public function movie_img($extra_attrs) {
     $attrs = array_merge($extra_attrs,
             array("id" => "player",
               "style" => "display:block;width:400px;height:300px")
diff --git a/modules/gallery/views/move_tree.html.php b/modules/gallery/views/move_tree.html.php
index 91a2f9da..5f70cf67 100644
--- a/modules/gallery/views/move_tree.html.php
+++ b/modules/gallery/views/move_tree.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<?= $parent->thumb_tag(array(), 25); ?>
+<?= $parent->thumb_img(array(), 25); ?>
 <? if (!access::can("edit", $parent) || $source->is_descendant($parent)): ?>
 <a href="javascript:load_tree('<?= $parent->id ?>',1)"> <?= p::clean($parent->title) ?> <?= t("(locked)") ?> </a>
 <? else: ?>
@@ -8,7 +8,7 @@
 <ul id="tree_<?= $parent->id ?>">
   <? foreach ($children as $child): ?>
   <li id="node_<?= $child->id ?>" class="node">
-    <?= $child->thumb_tag(array(), 25); ?>
+    <?= $child->thumb_img(array(), 25); ?>
     <? if (!access::can("edit", $child) || $source->is_descendant($child)): ?>
     <a href="javascript:load_tree('<?= $child->id ?>',1)"> <?= p::clean($child->title) ?> <?= t("(locked)") ?></a>
     <? else: ?>
diff --git a/modules/image_block/views/image_block_block.html.php b/modules/image_block/views/image_block_block.html.php
index 0ba9915e..48a3c912 100644
--- a/modules/image_block/views/image_block_block.html.php
+++ b/modules/image_block/views/image_block_block.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <div class="gImageBlock">
   <a href="<?= $item->url() ?>">
-   <?= $item->thumb_tag(array("class" => "gThumbnail")) ?>
+   <?= $item->thumb_image(array("class" => "gThumbnail")) ?>
   </a>
 </div>
diff --git a/modules/organize/views/organize_thumb_grid.html.php b/modules/organize/views/organize_thumb_grid.html.php
index 64d8aaf3..c80696ad 100644
--- a/modules/organize/views/organize_thumb_grid.html.php
+++ b/modules/organize/views/organize_thumb_grid.html.php
@@ -6,7 +6,7 @@
 <? endif ?>
 <li id="thumb_<?= $child->id ?>" class="gMicroThumbContainer" ref="<?= $child->id ?>">
   <div id="gMicroThumb-<?= $child->id ?>" class="gMicroThumb <?= $item_class ?>">
-    <?= $child->thumb_tag(array("class" => "gThumbnail"), $thumbsize, true) ?>
+    <?= $child->thumb_img(array("class" => "gThumbnail"), $thumbsize, true) ?>
   </div>
 </li>
 <? endforeach ?>
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index de4343ae..5db07bad 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -29,7 +29,7 @@
       <? endif ?>
    <li class="gItem <?= $item_class ?>">
       <a href="<?= url::site("items/$item->id") ?>">
-        <?= $item->thumb_tag() ?>
+        <?= $item->thumb_img() ?>
         <p>
           <?= p::clean($item->title) ?>
         </p>
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 6e17696d..7d4a6f54 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -15,7 +15,7 @@
   <li id="gItemId-<?= $child->id ?>" class="gItem <?= $item_class ?>">
     <?= $theme->thumb_top($child) ?>
     <a href="<?= $child->url() ?>">
-      <?= $child->thumb_tag(array("class" => "gThumbnail")) ?>
+      <?= $child->thumb_img(array("class" => "gThumbnail")) ?>
     </a>
     <?= $theme->thumb_bottom($child) ?>
     <h2><span></span><a href="<?= $child->url() ?>"><?= p::clean($child->title) ?></a></h2>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index cc069158..85143da8 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -29,7 +29,7 @@
     <? if (access::can("view_full", $item)): ?>
     <a href="#" class="gFullSizeLink" title="<?= t("View full size") ?>">
       <? endif ?>
-      <?= $item->resize_tag(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
+      <?= $item->resize_img(array("id" => "gPhotoId-{$item->id}", "class" => "gResize")) ?>
       <? if (access::can("view_full", $item)): ?>
     </a>
     <? endif ?>