diff --git a/plugins/content_types/webform_submission.inc b/plugins/content_types/webform_submission.inc
index 89eca20495874363ea3d7702c4b2fbd5754f0507..18a0444365d9dcb50493b67f4d69c65c4bc6e453 100644
--- a/plugins/content_types/webform_submission.inc
+++ b/plugins/content_types/webform_submission.inc
@@ -48,7 +48,7 @@ function webform_entity_webform_submission_content_type_render($subtype, $conf,
     return;
   }
 
-  $submission = webform_entity_load_webform_submission($sid);
+  $submission = webform_submission_entity_load($sid);
 
   // Don't store viewed webform submission data on the webform submission, this can mess up other
   // views of the webform submission.
@@ -142,7 +142,7 @@ function webform_entity_webform_submission_content_type_admin_title($subtype, $c
     return t('Webform submission loaded from @var', array('@var' => $conf['sid']));
   }
 
-  $submission = webform_entity_load_webform_submission($conf['sid']);
+  $submission = webform_submission_entity_load($conf['sid']);
   if ($submission) {
     return check_plain(t('submission @sid', array('@sid' => $submission->sid)));
   }
diff --git a/webform_entity.module b/webform_entity.module
index 39c94b3ca8947f73cfaed2f3c061d3fabbd04309..4748260253832ae40de95db35b767bfda1ff5b9e 100644
--- a/webform_entity.module
+++ b/webform_entity.module
@@ -883,15 +883,12 @@ function webform_entity_type_delete_confirm_submit($form, &$form_state) {
 }
 
 /**
- *
- * Note this function could not be called webform_entity_webform_submission_load()
- * because that would be a namespace colision.  Can't wait for PHP 5.3 to be
- * everywhere.
+ * Loads a webform submission from the database.
  *
  * @param $sid
  *   The sid of a sigle webform submission entity to load.
  */
-function webform_entity_load_webform_submission($sid) {
+function webform_submission_entity_load($sid) {
   if (is_numeric($sid)) {
     return array_pop(entity_get_controller('webform_submission_entity')->load(array($sid)));
   }
@@ -934,7 +931,7 @@ function webform_entity_submission_access($op, $entity = NULL, $account = NULL,
  * This callback is used by Entity API for programmatic deleting.
  */
 function webform_entity_delete_webform_submission($id) {
-  $submission = webform_entity_load_webform_submission($id);
+  $submission = webform_submission_entity_load($id);
   $node = node_load($submission->nid);
   webform_submission_delete($node, $submission);
 }