diff --git a/avatar_selection.module b/avatar_selection.module
index a3c113c..9b7f1c9 100644
--- a/avatar_selection.module
+++ b/avatar_selection.module
@@ -487,10 +487,10 @@ function _avatar_selection_image_list($user = '', $set_type = '', $set_id = 0, $
 
     // Not root user - join avatar_selection_roles table.
     elseif ($user->uid != 1) {
-      $count_avsr_alias = $count_query->join('avatar_selection_roles', 'avs', 'avs.aid = avsr.aid');
+      $count_avsr_alias = $count_query->join('avatar_selection_roles', 'avsr', 'avs.aid = avsr.aid');
       $count_query->condition(db_or()->isNULL("{$count_avsr_alias}.rid")->condition("{$count_avsr_alias}.rid", $user_roles, 'IN'));
 
-      $avsr_alias = $query->join('avatar_selection_roles', 'avs', 'avs.aid = avsr.aid');
+      $avsr_alias = $query->join('avatar_selection_roles', 'avsr', 'avs.aid = avsr.aid');
       $query->condition(db_or()->isNULL("{$avsr_alias}.rid")->condition("{$avsr_alias}.rid", $user_roles, 'IN'));
     }
   }