diff --git a/includes/simplenews.admin.inc b/includes/simplenews.admin.inc
index e6d5df2..93736df 100644
--- a/includes/simplenews.admin.inc
+++ b/includes/simplenews.admin.inc
@@ -311,7 +311,7 @@ function simplenews_build_issue_filter_query(SelectQueryInterface $query) {
  */
 function simplenews_admin_categories() {
   $form['#tree'] = TRUE;
-  if ($categories = simplenews_categories_load_multiple(array(), array('show_all' => TRUE))) {
+  if ($categories = simplenews_category_load_multiple(array(), array('show_all' => TRUE))) {
     foreach ($categories as $category) {
       $form[$category->tid]['#category'] = $category;
       $form[$category->tid]['name'] = array('#markup' => check_plain(_simplenews_newsletter_name($category)));
@@ -773,7 +773,7 @@ function simplenews_subscription_list_add_submit($form, &$form_state) {
       continue;
     }
     if (valid_email_address($email)) {
-      foreach (simplenews_categories_load_multiple($checked_categories) as $category) {
+      foreach (simplenews_category_load_multiple($checked_categories) as $category) {
 
         simplenews_subscribe_user($email, $category->tid, FALSE, 'mass subscribe', $langcode);
         $added[] = $email;
@@ -788,7 +788,7 @@ function simplenews_subscription_list_add_submit($form, &$form_state) {
     drupal_set_message(t('The following addresses were added or updated: %added.', array('%added' => $added)));
 
     $list_names = array();
-    foreach (simplenews_categories_load_multiple($checked_categories) as $category) {
+    foreach (simplenews_category_load_multiple($checked_categories) as $category) {
       $list_names[] = $category->name;
     }
     drupal_set_message(t('The addresses were subscribed to the following newsletters: %newsletters.', array('%newsletters' => implode(', ', $list_names))));
diff --git a/simplenews.install b/simplenews.install
index 53c9cdf..897a0cd 100644
--- a/simplenews.install
+++ b/simplenews.install
@@ -408,7 +408,7 @@ function _simplenews_init_simplenews_vocabulary() {
  */
 function _simplenews_init_simplenews_category() {
   if ($tree = taxonomy_get_tree(variable_get('simplenews_vid', ''))) {
-    $categories = simplenews_categories_load_multiple();
+    $categories = simplenews_category_load_multiple();
     $first = TRUE;
     foreach ($tree as $term) {
       // Create a newsletter category for each newsletter taxonomy term.
diff --git a/simplenews.module b/simplenews.module
index 82d47b9..01415b9 100644
--- a/simplenews.module
+++ b/simplenews.module
@@ -917,7 +917,7 @@ function simplenews_user_insert(&$edit, $account, $category) {  // Use the email
   if (isset($edit['newsletters'])) {
     $nl_tids = array_keys(array_filter($edit['newsletters']));
     if (!empty($nl_tids)) {
-      $newsletters = simplenews_categories_load_multiple($nl_tids, array('show_all' => TRUE));
+      $newsletters = simplenews_category_load_multiple($nl_tids, array('show_all' => TRUE));
       foreach ($newsletters as $newsletter) {
         simplenews_subscribe_user($account->mail, $newsletter->tid, FALSE, 'website', $edit['language']);
         drupal_set_message(t('You have been subscribed to %newsletter.', array('%newsletter' => _simplenews_newsletter_name($newsletter))));
@@ -1113,7 +1113,7 @@ function simplenews_block_info() {
   );
 
   // Only list a block if the newsletter is not 'hidden' and marked to provide a block.
-  foreach (simplenews_categories_load_multiple(array(), array('block' => '1', 'show_all' => FALSE)) as $category) {
+  foreach (simplenews_category_load_multiple(array(), array('block' => '1', 'show_all' => FALSE)) as $category) {
     //@todo 1. without form -> by role; 2. with form -> user caching with refresh on subscribe/unsubscribe (option as setting) or no caching
     $blocks[$category->tid] = array(
       'info' => t('Newsletter: @title', array('@title' => _simplenews_newsletter_name($category))),
@@ -1217,7 +1217,7 @@ function simplenews_block_view($delta = '') {
     return NULL;
   }
   else {
-    $newsletters = simplenews_categories_load_multiple(array(), array('block' => '1', 'show_all' => FALSE));
+    $newsletters = simplenews_category_load_multiple(array(), array('block' => '1', 'show_all' => FALSE));
 
     // Only display a block if $delta is a valid newsletter term id.
     if (in_array($delta, array_keys($newsletters))) {
@@ -1797,7 +1797,7 @@ function simplenews_category_load($tid, $reset = FALSE) {
   if (!is_numeric($tid)) {
     return FALSE;
   }
-  $categories = simplenews_categories_load_multiple(array($tid), $reset);
+  $categories = simplenews_category_load_multiple(array($tid), $reset);
   return $categories ? $categories[$tid] : FALSE;
 }
 
@@ -1808,7 +1808,7 @@ function simplenews_category_load($tid, $reset = FALSE) {
  *   array of category names. Translated if required.
  */
 function simplenews_category_list() {
-  $categories = simplenews_categories_load_multiple();
+  $categories = simplenews_category_load_multiple();
   $cats = array();
   foreach ($categories as $key => $category) {
     $cats[$key] = check_plain(_simplenews_newsletter_name($category));
@@ -1819,7 +1819,7 @@ function simplenews_category_list() {
 /**
  * @todo
  */
-function simplenews_categories_load_multiple($tids = array(), $conditions = array(), $reset = FALSE) {
+function simplenews_category_load_multiple($tids = array(), $conditions = array(), $reset = FALSE) {
   $categories = &drupal_static(__FUNCTION__, array());
 
   // Only cache if we load all records from the database. This could be improved.
@@ -1910,7 +1910,7 @@ function simplenews_get_mailing_lists($show_all = FALSE) {
   $all = $show_all ? 'all' : 'not_all';
 
   if (!isset($lists[$all])) {
-    $categories = simplenews_categories_load_multiple(array(), array('show_all' => $show_all));
+    $categories = simplenews_category_load_multiple(array(), array('show_all' => $show_all));
     $lists[$all] = $categories;
   }
   return $lists[$all];
diff --git a/tests/simplenews.test b/tests/simplenews.test
index af40865..68c59d5 100644
--- a/tests/simplenews.test
+++ b/tests/simplenews.test
@@ -625,8 +625,8 @@ class SimpleNewsAdministrationTestCase extends SimplenewsTestCase {
       }
     }
 
-    drupal_static_reset('simplenews_categories_load_multiple');
-    $categories = simplenews_categories_load_multiple();
+    drupal_static_reset('simplenews_category_load_multiple');
+    $categories = simplenews_category_load_multiple();
 
     // Check block settings.
     $this->drupalGet('admin/structure/block');
@@ -778,8 +778,8 @@ class SimpleNewsAdministrationTestCase extends SimplenewsTestCase {
     // Add a number of users to each category separately and then add another
     // bunch to both.
     $subscribers = array();
-    drupal_static_reset('simplenews_categories_load_multiple');
-    $categories = simplenews_categories_load_multiple();
+    drupal_static_reset('simplenews_category_load_multiple');
+    $categories = simplenews_category_load_multiple();
 
     $groups = array();
     foreach (array_keys($categories) as $tid) {
@@ -1105,7 +1105,7 @@ class SimpleNewsI18nTestCase extends SimplenewsTestCase {
     // Refresh strings.
     module_invoke_all('i18n_string_refresh', 'taxonomy');
 
-    $tid = array_shift(simplenews_categories_load_multiple())->tid;
+    $tid = array_shift(simplenews_category_load_multiple())->tid;
     // Translate term to spanish.
     list($textgroup, $context) = i18n_string_context(array('taxonomy', 'term', $tid, 'name'));
     i18n_string_textgroup($textgroup)->update_translation($context, 'es', $es_name = $this->randomName());