diff --git a/advpoll.install b/advpoll.install
index ff39390..285340e 100644
--- a/advpoll.install
+++ b/advpoll.install
@@ -105,7 +105,7 @@ function advpoll_uninstall() {
   if ($nid) {
     db_delete('votingapi_vote')
       ->condition('entity_id', $nid, 'IN')
-      ->condition('entity_type', 'advpoll')
+      ->condition('entity_type', 'node')
       ->execute();
 
     // Delete all the nodes at once
diff --git a/advpoll.module b/advpoll.module
index 5891260..0c550ff 100644
--- a/advpoll.module
+++ b/advpoll.module
@@ -331,7 +331,7 @@ function advpoll_node_presave($node) {
     if (isset($nid)) {
       $criteria = array();
       $criteria['entity_id'] = $node->nid;
-      $criteria['entity_type'] = 'advpoll';
+      $criteria['entity_type'] = 'node';
       $results = votingapi_select_votes($criteria);
 
       // Scrub any votes that are orphaned when a choice is removed.
@@ -356,7 +356,7 @@ function advpoll_node_presave($node) {
 function advpoll_node_delete($node) {
   db_delete('votingapi_vote')
     ->condition('entity_id', $node->nid)
-    ->condition('entity_type', 'advpoll')
+    ->condition('entity_type', 'node')
     ->execute();
 }
 
@@ -736,7 +736,7 @@ function advpoll_form_submit($form, &$form_state) {
   if (count($selected) > 0 && count($selected) <= $data->max_choices) {
     foreach ($selected as $item) {
       $vote = array();
-      $vote['type'] = 'advpoll';
+      $vote['type'] = 'node';
       $vote['tag'] = $item;
       $vote['nid'] = $nid;
       $vote['value'] = 1;
@@ -773,7 +773,7 @@ function advpoll_form_submit_check($data, $nid) {
     global $user;
     $criteria = array();
     $criteria['entity_id'] = $nid;
-    $criteria['entity_type'] = 'advpoll';
+    $criteria['entity_type'] = 'node';
 
     global $user;
     if ($user->uid) {
@@ -823,7 +823,7 @@ function advpoll_cancel_vote_submit($form, &$form_state) {
 
     $criteria = array();
     $criteria['entity_id'] = $nid;
-    $criteria['entity_type'] = 'advpoll';
+    $criteria['entity_type'] = 'node';
     $criteria['uid'] = $user->uid;
 
     votingapi_delete_votes(votingapi_select_votes($criteria));
diff --git a/advpoll_converter/advpoll_converter.admin.inc b/advpoll_converter/advpoll_converter.admin.inc
index 286f34a..dd20473 100644
--- a/advpoll_converter/advpoll_converter.admin.inc
+++ b/advpoll_converter/advpoll_converter.admin.inc
@@ -183,7 +183,7 @@ function _advpoll_converter_create_nodes($nids) {
     $votes = array();
     foreach ($poll_votes as $row) {
       $votes = array(
-        'entity_type' => 'advpoll',
+        'entity_type' => 'node',
         'entity_id' => $nid,
         'value' => 1,
         'tag' => $choice_by_id[$row->chid],
diff --git a/advpoll_ranking/advpoll_ranking.module b/advpoll_ranking/advpoll_ranking.module
index 6836a37..47aa3fb 100644
--- a/advpoll_ranking/advpoll_ranking.module
+++ b/advpoll_ranking/advpoll_ranking.module
@@ -461,7 +461,7 @@ function advpoll_ranking_process_votes($data, $nid, $votes) {
 
   foreach ($votes as $ranking) {
     $vote = array();
-    $vote['type'] = 'advpoll';
+    $vote['type'] = 'node';
     $vote['tag'] = $ranking['id'];
     $vote['nid'] = $nid;
     $vote['value'] = $points - ($ranking['rank'] - 1);
@@ -540,7 +540,7 @@ function advpoll_display_runoff_results($nid, $data, $page = 0) {
 
     $criteria = array();
     $criteria['entity_id'] = $nid;
-    $criteria['entity_type'] = 'advpoll';
+    $criteria['entity_type'] = 'node';
 
     $results = votingapi_select_votes($criteria);
 
@@ -837,7 +837,7 @@ function advpoll_ranking_cancel_vote_submit($form, &$form_state) {
 
     $criteria = array();
     $criteria['entity_id'] = $nid;
-    $criteria['entity_type'] = 'advpoll';
+    $criteria['entity_type'] = 'node';
     $criteria['uid'] = $user->uid;
 
     votingapi_delete_votes(votingapi_select_votes($criteria));
diff --git a/includes/advpoll.pages.inc b/includes/advpoll.pages.inc
index eb7a1ae..23bac9b 100644
--- a/includes/advpoll.pages.inc
+++ b/includes/advpoll.pages.inc
@@ -616,7 +616,7 @@ function advpoll_merge_writein_form_submit($form, &$form_state) {
   // transfer merge from votes to new vote object and update votingapi
   foreach ($merge_fromVotes as $vote) {
     $votes = array(
-      'entity_type' => 'advpoll',
+      'entity_type' => 'node',
       'entity_id' => $nid,
       'value' => $vote['value'],
       'tag' => $to_tag,
diff --git a/includes/advpoll_voteapi.inc b/includes/advpoll_voteapi.inc
index 39efb15..06f676b 100644
--- a/includes/advpoll_voteapi.inc
+++ b/includes/advpoll_voteapi.inc
@@ -22,7 +22,7 @@
 function advpoll_get_votes($nid, $behavior = 'approval') {
   $criteria = array();
   $criteria['entity_id'] = $nid;
-  $criteria['entity_type'] = 'advpoll';
+  $criteria['entity_type'] = 'node';
 
   $results = votingapi_select_votes($criteria);
 
@@ -233,7 +233,7 @@ function advpoll_user_eligibility($node) {
   if ($data->mode === 'normal') {
     $criteria = array();
     $criteria['entity_id'] = $node->nid;
-    $criteria['entity_type'] = $node->type;
+    $criteria['entity_type'] = 'node';
 
     if ($user->uid) {
       $criteria['uid'] = $user->uid;
@@ -394,7 +394,7 @@ function advpoll_get_user_votes($nid) {
   $votes = array();
   $criteria = array();
   $criteria['entity_id'] = $nid;
-  $criteria['entity_type'] = 'advpoll';
+  $criteria['entity_type'] = 'node';
 
   if ($user->uid) {
     $criteria['uid'] = $user->uid;
diff --git a/views/advpoll.views.inc b/views/advpoll.views.inc
index a62b775..c345c24 100644
--- a/views/advpoll.views.inc
+++ b/views/advpoll.views.inc
@@ -9,7 +9,7 @@ function advpoll_views_data_alter(&$views_data) {
 // behavior to tie votes to node.
   $default_relationships[] = array(
     'description' => t('Advanced Poll'),
-    'entity_type' => 'advpoll',
+    'entity_type' => 'node',
     'base_table' => 'node',
     'entity_id_column' => 'nid',
     'pseudo_vote' => 'votingapi_vote', // for legacy compatability w/RC1.