diff --git a/block/flickr_block.module b/block/flickr_block.module
index adea59a..9af1fab 100644
--- a/block/flickr_block.module
+++ b/block/flickr_block.module
@@ -111,7 +111,7 @@ function flickr_block_configure($delta = '') {
   $default = $user_id;
   if (isset($settings['user_id'])) {
     if (!empty($default) && $settings['user_id'] != 'public') {
-      $info = flickr_people_get_info($default);
+      $info = flickr_people_getinfo($default);
       $default = $info['username']['_content'];
     }
     else {
@@ -130,7 +130,7 @@ function flickr_block_configure($delta = '') {
     );
   }
   else {
-    $info = flickr_people_get_info(variable_get('flickr_default_userid', ''));
+    $info = flickr_people_getinfo(variable_get('flickr_default_userid', ''));
     $form["flickr_block_{$delta}_user_id"] = array(
       '#type' => 'textfield',
       '#title' => t('Flickr User ID'),
@@ -507,7 +507,7 @@ function flickr_block_save($delta = '', $edit = array()) {
           }
         }
         else {
-          $info = flickr_people_get_info($edit["flickr_block_{$delta}_user_id"]);
+          $info = flickr_people_getinfo($edit["flickr_block_{$delta}_user_id"]);
           drupal_set_message(t("The Flickr user associated with '%uid' will be shown to you as Flickr user '%userid'.", array('%uid' => $edit["flickr_block_{$delta}_user_id"], '%userid' => $info['username']['_content'])));
 
         }
@@ -540,7 +540,7 @@ function flickr_block_save($delta = '', $edit = array()) {
           }
         }
         else {
-          $info = flickr_people_get_info($edit["flickr_block_{$delta}_user_id"]);
+          $info = flickr_people_getinfo($edit["flickr_block_{$delta}_user_id"]);
           drupal_set_message(t("The Flickr user associated with '%uid' will be shown to you as Flickr user '%userid'.", array('%uid' => $edit["flickr_block_{$delta}_user_id"], '%userid' => $info['username']['_content'])));
 
         }
@@ -571,7 +571,7 @@ function flickr_block_save($delta = '', $edit = array()) {
           }
         }
         else {
-          $info = flickr_people_get_info($edit["flickr_block_{$delta}_user_id"]);
+          $info = flickr_people_getinfo($edit["flickr_block_{$delta}_user_id"]);
           drupal_set_message(t("The Flickr user associated with '%uid' will be shown to you as Flickr user '%userid'.", array('%uid' => $edit["flickr_block_{$delta}_user_id"], '%userid' => $info['username']['_content'])));
 
         }
@@ -633,7 +633,7 @@ function flickr_block_save($delta = '', $edit = array()) {
           }
         }
         else {
-          $info = flickr_people_get_info($edit["flickr_block_{$delta}_user_id"]);
+          $info = flickr_people_getinfo($edit["flickr_block_{$delta}_user_id"]);
           drupal_set_message(t("The Flickr user associated with '%uid' will be shown to you as Flickr user '%userid'.", array('%uid' => $edit["flickr_block_{$delta}_user_id"], '%userid' => $info['username']['_content'])));
 
         }
@@ -1084,7 +1084,7 @@ function _flickr_block_photosets($nsid, $show_n, $size, $media, $delta, $people
     $output = $cache->data;
   }
   else {
-    $photosets = flickr_photoset_get_list($nsid);
+    $photosets = flickr_photosets_getlist($nsid);
     $output = '<div class="flickr-block-photosets">';
     $to = min($show_n, count($photosets));
     for ($i = 0; $i < $to; $i++) {
diff --git a/field/flickrfield.module b/field/flickrfield.module
index 48256d4..be53010 100644
--- a/field/flickrfield.module
+++ b/field/flickrfield.module
@@ -354,7 +354,7 @@ function theme_flickrfield_field_formatter($element) {
   $formatter = $element['#formatter'];
   switch ($item['type']) {
     case 'photo_id':
-      $photo_data = flickr_photo_get_info($item['id']);
+      $photo_data = flickr_photos_getinfo($item['id']);
       return theme('flickr_photo', array(
         'format' => NULL,
         'attribs' => NULL,
@@ -363,7 +363,7 @@ function theme_flickrfield_field_formatter($element) {
       ));
 
     case 'id':
-      $photo_data = flickr_photoset_get_info($item['id']);
+      $photo_data = flickr_photosets_getinfo($item['id']);
       return theme('flickr_photoset', array(
         'owner' => $photo_data['owner'],
         'attribs' => NULL,
@@ -383,7 +383,7 @@ function theme_flickrfield_formatter_photoset_primaryphoto($element) {
     return;
   }
   $formatter_info = explode('_', $element['#formatter']);
-  $set_data = flickr_photoset_get_info($element['#item']['flickrid']);
+  $set_data = flickr_photosets_getinfo($element['#item']['flickrid']);
   $set_url = flickr_photoset_page_url($set_data['owner'], $set_data['id']);
   $size = substr($formatter_info[2], -1);
   $img = flickr_img($set_data, $size);
@@ -438,7 +438,7 @@ function theme_flickrfield_formatter_photoset_flickrcomslideshow_simple($variabl
  * Theme a Flickr photoset as a simple link to the photoset page on Flickr.com.
  */
 function theme_flickrfield_formatter_photoset_flickrcomsetlink($variables) {
-  $set_data = flickr_photoset_get_info($variables['#item']['flickrid']);
+  $set_data = flickr_photosets_getinfo($variables['#item']['flickrid']);
   $set_url = flickr_photoset_page_url($set_data['owner'], $set_data['id']);
   return l($set_url, $set_url);
 }
diff --git a/filter/flickr_filter.module b/filter/flickr_filter.module
index 1ff2c61..cc20fa7 100644
--- a/filter/flickr_filter.module
+++ b/filter/flickr_filter.module
@@ -52,7 +52,7 @@ function flickr_filter_tips($filter, $format, $long = FALSE) {
   ));
   $count = variable_get('flickr_counter', 1) ? 'true' : 'false';
   $default_userid = variable_get('flickr_default_userid', '');
-  $info = empty($default_userid) ? '' : flickr_people_get_info(variable_get('flickr_default_userid', ''));
+  $info = empty($default_userid) ? '' : flickr_people_getinfo(variable_get('flickr_default_userid', ''));
   $default_userid = empty($info) ? '[undefined]' : $info['username']['_content'];
   $output = t("Insert a <strong>Flickr photo</strong>. A working example:
   <ul>
@@ -185,7 +185,7 @@ function flickr_filter_split_config($string) {
 function flickr_filter_callback_photo($matches) {
   list($config, $attribs) = flickr_filter_split_config($matches[1]);
   if (isset($config['id'])) {
-    if ($photo = flickr_photo_get_info($config['id'])) {
+    if ($photo = flickr_photos_getinfo($config['id'])) {
       if (!isset($config['size'])) {
         $config['size'] = variable_get('flickr_filter_default_size', 'm');
       }
@@ -203,7 +203,7 @@ function flickr_filter_callback_photo($matches) {
           break;
       }
       $sizes = flickr_photo_sizes();
-      if (flickr_in_array_r($sizes[$config['size']]['label'], flickr_photo_get_sizes($photo['id']))) {
+      if (flickr_in_array_r($sizes[$config['size']]['label'], flickr_photos_getsizes($photo['id']))) {
         return theme('flickr_photo', array(
           'photo' => $photo,
           'size' => $config['size'],
diff --git a/flickr.admin.inc b/flickr.admin.inc
index bf1e540..943cedf 100644
--- a/flickr.admin.inc
+++ b/flickr.admin.inc
@@ -30,7 +30,7 @@ function flickr_admin_settings() {
   );
   $default = variable_get('flickr_default_userid', '');
   if (!empty($default)) {
-    $info = flickr_people_get_info($default);
+    $info = flickr_people_getinfo($default);
     $default = $info['username']['_content'];
   }
   $form['flickr_default_userid'] = array(
@@ -489,7 +489,7 @@ function flickr_admin_settings_submit($form, &$form_state) {
     }
   }
   else {
-    $info = flickr_people_get_info($form_state['values']['flickr_default_userid']);
+    $info = flickr_people_getinfo($form_state['values']['flickr_default_userid']);
     drupal_set_message(t("The Flickr user associated with '%uid' will be shown to you as Flickr user '%userid'.", array('%uid' => $form_state['values']['flickr_default_userid'], '%userid' => $info['username']['_content'])));
   }
 }
diff --git a/flickr.api.inc b/flickr.api.inc
index 168ffc0..51209ac 100644
--- a/flickr.api.inc
+++ b/flickr.api.inc
@@ -4,9 +4,6 @@
  * Flickr API functions.
  */
 
-// TODO: Would like to implement a consistent naming for drupal wrapper
-// functions around flick API methods e.g covert a "." to an "underscore" only
-// i.e for flickr.photos.getInfo use flickr_photos_getinfo()
 /**
  * Get information about a photo.
  *
@@ -17,7 +14,7 @@
  *   Response from the flickr method flickr.photos.getInfo..
  *   (https://www.flickr.com/services/api/flickr.photos.getInfo.html)
  */
-function flickr_photo_get_info($photo_id) {
+function flickr_photos_getinfo($photo_id) {
   $response = flickr_request(
     'flickr.photos.getInfo',
     array('photo_id' => $photo_id)
@@ -38,7 +35,7 @@ function flickr_photo_get_info($photo_id) {
  *   Response from the flickr method flickr.photos.getSizes..
  *   (https://www.flickr.com/services/api/flickr.photos.getSizes.html)
  */
-function flickr_photo_get_sizes($photo_id) {
+function flickr_photos_getsizes($photo_id) {
   $response = flickr_request(
     'flickr.photos.getSizes',
     array('photo_id' => $photo_id)
@@ -102,7 +99,7 @@ function flickr_photos_search($nsid, $page = 1, $other_args = array()) {
  *   Response from the flickr method flickr.favorites.getPublicList.
  *   (https://www.flickr.com/services/api/flickr.favorites.getPublicList.html)
  */
-function flickr_favorites_get_public_list($nsid, $page = 1, $other_args = array()) {
+function flickr_favorites_getpubliclist($nsid, $page = 1, $other_args = array()) {
   $args = array(
     'user_id' => $nsid,
     'page' => $page,
@@ -130,7 +127,7 @@ function flickr_favorites_get_public_list($nsid, $page = 1, $other_args = array(
  *   Response from the flickr method flickr.photosets.getInfo.
  *   (https://www.flickr.com/services/api/flickr.photosets.getInfo.html)
  */
-function flickr_photoset_get_info($photoset_id) {
+function flickr_photosets_getinfo($photoset_id) {
   $response = flickr_request(
     'flickr.photosets.getInfo',
     array('photoset_id' => $photoset_id)
@@ -151,7 +148,7 @@ function flickr_photoset_get_info($photoset_id) {
  *   Response from the flickr method flickr.photosets.getList.
  *   (https://www.flickr.com/services/api/flickr.photosets.getList.html)
  */
-function flickr_photoset_get_list($nsid, $page = NULL) {
+function flickr_photosets_getlist($nsid, $page = NULL) {
   $per_page = (!empty($page)) ? variable_get('flickr_sets_per_page', 8) : '';
   $response = flickr_request(
     'flickr.photosets.getList',
@@ -231,7 +228,7 @@ function flickr_photosets_getphotos($photoset_id, $other_args = array(), $page =
  *   (https://www.flickr.com/services/api/flickr.people.getInfo.html)
  *   or FALSE on error.
  */
-function flickr_people_get_info($nsid) {
+function flickr_people_getinfo($nsid) {
   $response = flickr_request(
     'flickr.people.getInfo',
     array('user_id' => $nsid)
@@ -252,7 +249,7 @@ function flickr_people_get_info($nsid) {
  *   Response from the flickr method flickr.people.findByUsername.
  *   (https://www.flickr.com/services/api/flickr.people.findByUsername.html)
  */
-function flickr_user_find_by_username($username) {
+function flickr_people_findbyusername($username) {
   $response = flickr_request(
     'flickr.people.findByUsername',
     array('username' => $username)
@@ -273,7 +270,7 @@ function flickr_user_find_by_username($username) {
  *   Response from the flickr method flickr.people.findByUsername.
  *   (https://www.flickr.com/services/api/flickr.people.findByUsername.html)
  */
-function flickr_user_find_by_alias($alias) {
+function flickr_urls_lookupuser($alias) {
   $response = flickr_request(
     'flickr.urls.lookupUser',
     array('url' => 'https://www.flickr.com/photos/' . $alias),
@@ -298,7 +295,7 @@ function flickr_user_find_by_alias($alias) {
  *   Response from the flickr method flickr.people.findByEmail.
  *   (https://www.flickr.com/services/api/flickr.people.findByEmail.html)
  */
-function flickr_user_find_by_email($email) {
+function flickr_people_findbyemail($email) {
   $response = flickr_request(
     'flickr.people.findByEmail',
     array('find_email' => $email)
@@ -321,7 +318,7 @@ function flickr_user_find_by_email($email) {
  *   Response from the flickr method flickr.tags.getListUserPopular.
  *   (https://www.flickr.com/services/api/flickr.tags.getListUserPopular.html)
  */
-function flickr_tags_get_list_user_popular($nsid, $count = NULL) {
+function flickr_tags_getlistuserpopular($nsid, $count = NULL) {
   $args = array('user_id' => $nsid);
   if ($count != NULL) {
     $args['count'] = $count;
@@ -343,7 +340,7 @@ function flickr_tags_get_list_user_popular($nsid, $count = NULL) {
  *   Response from the flickr method flickr.tags.getListUser.
  *   (https://www.flickr.com/services/api/flickr.tags.getListUser.html)
  */
-function flickr_tags_get_list_user($nsid) {
+function flickr_tags_getlistuser($nsid) {
   $response = flickr_request(
     'flickr.tags.getListUser',
     array('user_id' => $nsid)
@@ -354,7 +351,6 @@ function flickr_tags_get_list_user($nsid) {
   return FALSE;
 }
 
-// TODO: Change name to flickr_groups_pools_getphotos()?
 /**
  * Returns a list of pool photos for a given group.
  *
@@ -365,7 +361,7 @@ function flickr_tags_get_list_user($nsid) {
  *   Response from the flickr method flickr.groups.pools.getPhotos.
  *   (https://www.flickr.com/services/api/flickr.groups.pools.getPhotos.html)
  */
-function flickr_get_group_photos($nsid, $page = 1, $other_args = array()) {
+function flickr_groups_pools_getphotos($nsid, $page = 1, $other_args = array()) {
   $args = array(
     'group_id' => $nsid,
     'page' => $page,
diff --git a/flickr.inc b/flickr.inc
index 4c120a7..3e71d9a 100644
--- a/flickr.inc
+++ b/flickr.inc
@@ -218,7 +218,7 @@ function flickr_img($photo, $size = NULL, $attributes = NULL) {
     ));
   }
 
-  $image_sizes = flickr_photo_get_sizes($id);
+  $image_sizes = flickr_photos_getsizes($id);
   if ($image_sizes) {
     foreach ($image_sizes as $image_size) {
       if ($image_size['label'] == $sizes[$size]['label']) {
@@ -232,7 +232,7 @@ function flickr_img($photo, $size = NULL, $attributes = NULL) {
   else {
     $img_url = flickr_photo_img($photo, $size);
   }
-  $info = !is_array($photo['title']) ? flickr_photo_get_info($photo['id']) : '';
+  $info = !is_array($photo['title']) ? flickr_photos_getinfo($photo['id']) : '';
   $title = is_array($photo['title']) ? str_replace('"', "'", htmlspecialchars_decode(strip_tags($photo['description']['_content']))) : str_replace('"', "'", htmlspecialchars_decode(strip_tags($info['description']['_content'])));
   if (empty($title) == 'title') {
     $title = $photo['title'];
@@ -297,7 +297,7 @@ function flickr_photo_img($photo, $size = NULL, $format = NULL) {
  */
 function flickr_photo_page_url($owner, $id = NULL) {
   $nsid = is_array($owner) ? $owner['nsid'] : $owner;
-  if ($person = flickr_people_get_info($nsid)) {
+  if ($person = flickr_people_getinfo($nsid)) {
     return $person['photosurl']['_content'] . $id;
   }
   else {
@@ -318,7 +318,7 @@ function flickr_photo_page_url($owner, $id = NULL) {
  */
 function flickr_photoset_page_url($owner, $id = NULL) {
   $nsid = is_array($owner) ? $owner['nsid'] : $owner;
-  if ($person = flickr_people_get_info($nsid)) {
+  if ($person = flickr_people_getinfo($nsid)) {
     return $person['photosurl']['_content'] . 'sets/' . $id;
   }
   else {
@@ -349,13 +349,13 @@ function flickr_user_find_by_identifier($identifier) {
     // Identifier is an NSID.
     return $identifier;
   }
-  if (valid_email_address($identifier) && ($user = flickr_user_find_by_email($identifier))) {
+  if (valid_email_address($identifier) && ($user = flickr_people_findbyemail($identifier))) {
     return $user['nsid'];
   }
-  if ($user = flickr_user_find_by_alias($identifier)) {
+  if ($user = flickr_urls_lookupuser($identifier)) {
     return $user['id'];
   }
-  if ($user = flickr_user_find_by_username($identifier)) {
+  if ($user = flickr_people_findbyusername($identifier)) {
     return $user['nsid'];
   }
   return FALSE;
@@ -418,7 +418,7 @@ function flickr_set_error($message_or_response) {
 
 /**
  * Returns Flickr detialed data based on nsid.
- * An elaboration of flickr_people_get_info.
+ * An elaboration of flickr_people_getinfo.
  *
  * @param string $nsid
  *   A valid Flickr numerical user ID. Should be validated before arriving here.
@@ -428,7 +428,7 @@ function flickr_set_error($message_or_response) {
  *   Real name if it exists, if not the username.
  */
 function flickr_get_user_info($nsid) {
-  $info = flickr_people_get_info($nsid);
+  $info = flickr_people_getinfo($nsid);
   $people = array();
   $people['name'] = !empty($info['realname']['_content']) ? l($info['realname']['_content'], $info['profileurl']['_content'], array(
     'attributes' => array(
@@ -588,7 +588,7 @@ function _flickr_album($type = 'user', $id = '39873962@N08', $show_n = NULL, $si
     // Get information about the album, including the owner if needed later on.
     switch ($type) {
       case "photoset":
-        $info = flickr_photoset_get_info($id);
+        $info = flickr_photosets_getinfo($id);
         $people = flickr_get_user_info($info['owner']);
         if (!$info) {
           return;
@@ -945,7 +945,7 @@ function _flickr_album($type = 'user', $id = '39873962@N08', $show_n = NULL, $si
           case "group":
             // If only one tag exists, use it to circumvent the 500 limit.
             $tags1 = (strpos($tags, ',') !== FALSE) ? '' : $tags;
-            $response = flickr_get_group_photos($id, $page, array(
+            $response = flickr_groups_pools_getphotos($id, $page, array(
               'tags' => $tags1,
               'per_page' => $per_page,
               'extras' => 'date_upload,date_taken,license,geo,tags,views,media',
@@ -957,7 +957,7 @@ function _flickr_album($type = 'user', $id = '39873962@N08', $show_n = NULL, $si
             break;
 
           case "favorites":
-            $response = flickr_favorites_get_public_list($id, 1, array(
+            $response = flickr_favorites_getpubliclist($id, 1, array(
               'per_page' => $per_page,
               'extras' => 'date_upload,date_taken,license,geo,tags,views,media',
             ));
@@ -1069,7 +1069,7 @@ function _flickr_album($type = 'user', $id = '39873962@N08', $show_n = NULL, $si
               $photo['owner'] = ($type == 'photoset') ? $info['owner'] : $photo['owner'];
               $photo['owner'] = ($type == 'gallery') ? $info['gallery']['owner'] : $photo['owner'];
               // Check if the requested size is available on Flickr.
-              if (flickr_in_array_r($sizes[$size]['label'], flickr_photo_get_sizes($photo['id']))) {
+              if (flickr_in_array_r($sizes[$size]['label'], flickr_photos_getsizes($photo['id']))) {
                 $output .= theme('flickr_photo', array(
                   'photo' => $photo,
                   'size' => $size,
@@ -1096,7 +1096,7 @@ function _flickr_album($type = 'user', $id = '39873962@N08', $show_n = NULL, $si
               }
               elseif (stripos($photo['tags'], $term) !== FALSE && ($media == 'all' || $media == $photo['media'] . 's')) {
                 // Check if the requested size is available on Flickr.
-                if (flickr_in_array_r($sizes[$size]['label'], flickr_photo_get_sizes($photo['id']))) {
+                if (flickr_in_array_r($sizes[$size]['label'], flickr_photos_getsizes($photo['id']))) {
                   $output .= theme('flickr_photo', array(
                     'photo' => $photo,
                     'size' => $size,
@@ -1131,7 +1131,7 @@ function _flickr_album($type = 'user', $id = '39873962@N08', $show_n = NULL, $si
                 $photo['owner'] = $type == 'photoset' ? $info['owner'] : $photo['owner'];
                 $photo['owner'] = $type == 'gallery' ? $info['gallery']['owner'] : $photo['owner'];
                 // Check if the requested size is available on Flickr.
-                if (flickr_in_array_r($sizes[$size]['label'], flickr_photo_get_sizes($photo['id']))) {
+                if (flickr_in_array_r($sizes[$size]['label'], flickr_photos_getsizes($photo['id']))) {
                   $output .= theme('flickr_photo', array(
                     'photo' => $photo,
                     'size' => $size,
@@ -1171,7 +1171,7 @@ function _flickr_album($type = 'user', $id = '39873962@N08', $show_n = NULL, $si
                   // TODO: In theory we don't get here if a gallery. Remove?
                   $photo['owner'] = ($type == 'gallery') ? $info['gallery']['owner'] : $photo['owner'];
                   // Check if the requested size is available on Flickr.
-                  if (flickr_in_array_r($sizes[$size]['label'], flickr_photo_get_sizes($photo['id']))) {
+                  if (flickr_in_array_r($sizes[$size]['label'], flickr_photos_getsizes($photo['id']))) {
                     $output .= theme('flickr_photo', array(
                       'photo' => $photo,
                       'size' => $size,
diff --git a/flickr.module b/flickr.module
index 6883483..1ec1717 100644
--- a/flickr.module
+++ b/flickr.module
@@ -426,7 +426,7 @@ function theme_flickr_photo($variables) {
     }
   }
   $photo_url = flickr_photo_page_url($photo['owner'], $photo['id']);
-  $info = flickr_photo_get_info($photo['id']);
+  $info = flickr_photos_getinfo($photo['id']);
   $people = flickr_get_user_info($info['owner']['nsid']);
   switch ($info['license']) {
     case '0':
@@ -602,7 +602,7 @@ function theme_flickr_photo($variables) {
       $url = $photo_url;
     }
     if (!isset($photo['media'])) {
-      $photo = flickr_photo_get_info($photo['id']);
+      $photo = flickr_photos_getinfo($photo['id']);
     }
     if ($photo['media'] == 'video' && module_exists('colorbox') && variable_get('colorbox_inline', 0) == 1) {
       return '<div style="display: none;">
@@ -758,7 +758,7 @@ function theme_flickr_flickrcomslideshow($variables) {
   }
   switch (flickr_get_id_type($id)) {
     case 'photoset':
-      $info = flickr_photoset_get_info($id);
+      $info = flickr_photosets_getinfo($id);
       $user_id = $info['owner'];
       return '<div class="flickr-slideshow"><object type="application/x-shockwave-flash" data="https://www.flickr.com/apps/slideshow/show.swf?v=71649">
     <param name="movie" value="https://www.flickr.com/apps/slideshow/show.swf?v=71649" />
@@ -791,7 +791,7 @@ function theme_flickr_flickrcomslideshow_simple($variables) {
   }
   switch (flickr_get_id_type($id)) {
     case 'photoset':
-      $info = flickr_photoset_get_info($id);
+      $info = flickr_photosets_getinfo($id);
       $user_id = $info['owner'];
       $src = 'https://www.flickr.com/slideShow/index.gne?group_id=&user_id=' . $user_id . '&set_id=' . $id . '&text=';
       break;
diff --git a/sets/flickr_sets.module b/sets/flickr_sets.module
index 98aafb2..acfa722 100644
--- a/sets/flickr_sets.module
+++ b/sets/flickr_sets.module
@@ -81,11 +81,11 @@ function flickr_sets_photosets($account, $nsid = NULL) {
   $pager_page_array[$element] = empty($_GET['page']) ? 0 : (int) $_GET['page'];
   $per_page = variable_get('flickr_sets_per_page', 8);
   // First we need the complete list of sets just for the pager info.
-  $set_response = flickr_photoset_get_list($nsid);
+  $set_response = flickr_photosets_getlist($nsid);
   $pager_total[$element] = ceil(count($set_response) / variable_get('flickr_sets_per_page', 8));
   $pager_total_items[$element] = count($set_response);
   // Now we only get the sets for the corresponding page.
-  $set_response = flickr_photoset_get_list($nsid, $pager_page_array[$element] + 1);
+  $set_response = flickr_photosets_getlist($nsid, $pager_page_array[$element] + 1);
 
   if ($set_response === FALSE) {
     drupal_set_message(t("Error retrieving %user's photosets from Flickr", array('%user' => $account->name)));
@@ -113,7 +113,7 @@ function flickr_sets_photoset($account, $set) {
   $uid = $account->uid;
   $nsid = $account->flickr['nsid'];
   $id = $set['photoset']['id'];
-  $set_info = flickr_photoset_get_info($id);
+  $set_info = flickr_photosets_getinfo($id);
 
   // Make sure that $nsid is the real owner of $id.
   if ($nsid != $set_info['owner']) {
diff --git a/tags/flickr_tags.module b/tags/flickr_tags.module
index 30f9f72..22a310a 100644
--- a/tags/flickr_tags.module
+++ b/tags/flickr_tags.module
@@ -58,7 +58,7 @@ function flickr_tags_cloud($account, $nsid = NULL) {
   drupal_set_title(t('Flickr tags cloud - @name', array('@name' => $account->name)));
   $nsid = $account->flickr['nsid'];
   // Get tag info.
-  $poptag_response = flickr_tags_get_list_user_popular($nsid, variable_get('flickr_tags_in_cloud', 150));
+  $poptag_response = flickr_tags_getlistuserpopular($nsid, variable_get('flickr_tags_in_cloud', 150));
 
   if ($poptag_response === FALSE) {
     drupal_set_message(t("Error retrieving %user's tags from Flickr", array('%user' => $account->name)));
@@ -91,7 +91,7 @@ function flickr_tags_list($account, $nsid = NULL) {
   drupal_set_title(t('Flickr tags list - @name', array('@name' => $account->name)));
   $nsid = $account->flickr['nsid'];
   // Get all tags.
-  $taglist_response = flickr_tags_get_list_user($nsid);
+  $taglist_response = flickr_tags_getlistuser($nsid);
 
   if ($taglist_response === FALSE) {
     drupal_set_message(t("Error retrieving %user's tags from Flickr", array('%user' => $account->name)));