diff --git advpoll-display-binary-form.tpl.php advpoll-display-binary-form.tpl.php
deleted file mode 100644
index 3dcf2e1..0000000
--- advpoll-display-binary-form.tpl.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-// $Id: advpoll-display-binary-form.tpl.php,v 1.1.2.1 2010/06/25 23:17:14 mirodietiker Exp $
-
-/**
- * @file advpoll-display-binary-form.tpl.php
- * Default theme implementation to show voting form for binary polls.
- *
- * $writein_choice - writein_choice element, if poll needs it.
- * $form_id
- * $form_submit
- * $choice_list - choices in the poll.
- */
-?>
-<div class="poll">
-  <div class="advpoll-available-choices">
-    <div class="choice-header"><?php print t('Choices') ?></div>
-    <div class="vote-choices">
-      <?php print $choice_list ?>
-    </div>
-    <?php if (isset($writein_choice)): ?>
-    <div class="writein-choice"><?php print $writein_choice ?></div>
-    <?php endif; ?>
-  </div>
-  <?php print $form_submit ?>
-  <br/>
-  <?php if ($message): ?><p class="message"><?php print $message ?></p><?php endif; ?>
-</div>
diff --git advpoll-display-ranking-form.tpl.php advpoll-display-ranking-form.tpl.php
deleted file mode 100644
index a7cf636..0000000
--- advpoll-display-ranking-form.tpl.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-// $Id: advpoll-display-ranking-form.tpl.php,v 1.1.2.3 2010/07/31 23:19:55 mirodietiker Exp $
-
-/**
- * @file advpoll-display-ranking-form.tpl.php
- * Default theme implementation to show voting form for ranked polls.
- *
- * $writein_choice - writein_choice element, if poll needs it.
- * $form_id
- * $form_submit
- * $choice_list - choices in the poll.
- * $tabledrag_group_class
- */
-?>
-<div class="poll">
-  <div class="advpoll-available-choices">
-    <div class="choice-header"><?php print t('Choices'); ?></div>
-    <div class="vote-choices">
-      <?php print $choice_list; ?>
-    </div>
-    <?php if (isset($writein_choice)): ?>
-    <div class="writein-choice"><?php print $writein_choice; ?></div>
-    <?php endif; ?>
-  </div>
-  <!-- table-drag re-ordering if JavaScript is enabled. -->
-  <div class="advpoll-drag-box">
-    <div class="advpoll-vote-header"><?php print t('Your Vote'); ?></div>
-    <table cellspacing="0" id="<?php print $form_id ?>-table" class="advpoll-existing-choices-table">
-    </table>
-    <div class="vote-status"></div>
-  </div>
-  <?php print $form_submit; ?>
-  <br />
-  <?php if ($message): ?><p class="message"><?php print $message; ?></p><?php endif; ?>
-</div>
diff --git advpoll-voting-binary-form.tpl.php advpoll-voting-binary-form.tpl.php
new file mode 100644
index 0000000..3dcf2e1
--- /dev/null
+++ advpoll-voting-binary-form.tpl.php
@@ -0,0 +1,27 @@
+<?php
+// $Id: advpoll-display-binary-form.tpl.php,v 1.1.2.1 2010/06/25 23:17:14 mirodietiker Exp $
+
+/**
+ * @file advpoll-display-binary-form.tpl.php
+ * Default theme implementation to show voting form for binary polls.
+ *
+ * $writein_choice - writein_choice element, if poll needs it.
+ * $form_id
+ * $form_submit
+ * $choice_list - choices in the poll.
+ */
+?>
+<div class="poll">
+  <div class="advpoll-available-choices">
+    <div class="choice-header"><?php print t('Choices') ?></div>
+    <div class="vote-choices">
+      <?php print $choice_list ?>
+    </div>
+    <?php if (isset($writein_choice)): ?>
+    <div class="writein-choice"><?php print $writein_choice ?></div>
+    <?php endif; ?>
+  </div>
+  <?php print $form_submit ?>
+  <br/>
+  <?php if ($message): ?><p class="message"><?php print $message ?></p><?php endif; ?>
+</div>
diff --git advpoll-voting-ranking-form.tpl.php advpoll-voting-ranking-form.tpl.php
new file mode 100644
index 0000000..a7cf636
--- /dev/null
+++ advpoll-voting-ranking-form.tpl.php
@@ -0,0 +1,35 @@
+<?php
+// $Id: advpoll-display-ranking-form.tpl.php,v 1.1.2.3 2010/07/31 23:19:55 mirodietiker Exp $
+
+/**
+ * @file advpoll-display-ranking-form.tpl.php
+ * Default theme implementation to show voting form for ranked polls.
+ *
+ * $writein_choice - writein_choice element, if poll needs it.
+ * $form_id
+ * $form_submit
+ * $choice_list - choices in the poll.
+ * $tabledrag_group_class
+ */
+?>
+<div class="poll">
+  <div class="advpoll-available-choices">
+    <div class="choice-header"><?php print t('Choices'); ?></div>
+    <div class="vote-choices">
+      <?php print $choice_list; ?>
+    </div>
+    <?php if (isset($writein_choice)): ?>
+    <div class="writein-choice"><?php print $writein_choice; ?></div>
+    <?php endif; ?>
+  </div>
+  <!-- table-drag re-ordering if JavaScript is enabled. -->
+  <div class="advpoll-drag-box">
+    <div class="advpoll-vote-header"><?php print t('Your Vote'); ?></div>
+    <table cellspacing="0" id="<?php print $form_id ?>-table" class="advpoll-existing-choices-table">
+    </table>
+    <div class="vote-status"></div>
+  </div>
+  <?php print $form_submit; ?>
+  <br />
+  <?php if ($message): ?><p class="message"><?php print $message; ?></p><?php endif; ?>
+</div>
diff --git advpoll.module advpoll.module
index a353d19..ec43912 100644
--- advpoll.module
+++ advpoll.module
@@ -1652,18 +1652,14 @@ function advpoll_theme() {
       )
     ),
     'advpoll_voting_ranking_form' => array(
-      'template' => 'advpoll-display-ranking-form',
+      'template' => 'advpoll-voting-ranking-form',
       'file' => 'modes/ranking.inc',
-      'arguments' => array(
-        'form' => NULL,
-      )
+      'arguments' => array('form' => NULL),
     ),
     'advpoll_voting_binary_form' => array(
-      'template' => 'advpoll-display-binary-form',
+      'template' => 'advpoll-voting-binary-form',
       'file' => 'modes/binary.inc',
-      'arguments' => array(
-        'form' => NULL,
-      )
+      'arguments' => array('form' => NULL),
     ),
   );
 }