diff --git a/includes/nodequeue.admin.inc b/includes/nodequeue.admin.inc
index 7efa512..85d5ee4 100644
--- a/includes/nodequeue.admin.inc
+++ b/includes/nodequeue.admin.inc
@@ -795,7 +795,7 @@ function nodequeue_arrange_subqueue_form($form, $form_state, $queue, $nodes, $su
       '#delta' => $count,
       '#default_value' => $node->position,
       '#attributes' => array(
-        'class' => array('node-position'),
+        'class' => array('nodequeue-position'),
       ),
     );
 
diff --git a/nodequeue.module b/nodequeue.module
index 312e02d..aff32e3 100644
--- a/nodequeue.module
+++ b/nodequeue.module
@@ -2114,7 +2114,7 @@ function theme_nodequeue_arrange_subqueue_form_table($variables) {
     'nodequeue-dragdrop-sqid-' . $form['#subqueue']['sqid'],
     'nodequeue-dragdrop-reference-' . $form['#subqueue']['reference'],
   );
-  drupal_add_tabledrag($table_id, 'order', 'sibling', 'node-position');
+  drupal_add_tabledrag($table_id, 'order', 'sibling', 'nodequeue-position');
   drupal_add_js(drupal_get_path('module', 'nodequeue') . '/nodequeue_dragdrop.js');
 
   $reverse[str_replace('-', '_', $table_id)] = (bool) $form['#queue']['reverse'];
diff --git a/nodequeue_dragdrop.js b/nodequeue_dragdrop.js
index 406b76f..ad6acfa 100644
--- a/nodequeue_dragdrop.js
+++ b/nodequeue_dragdrop.js
@@ -19,7 +19,7 @@ Drupal.behaviors.nodequeueDrag = {
 
 Drupal.behaviors.nodequeueWeightChange = {
   attach: function(context) {
-    $('.nodequeue-dragdrop tr.draggable select.node-position').bind('change', function() {
+    $('.nodequeue-dragdrop tr.draggable select.nodequeue-position').bind('change', function() {
       var table_id = $(this).parents('.nodequeue-dragdrop').attr('id');
       var row = $(this).parents('tr');
       var pos = $(this).attr('value') * 1;
@@ -93,7 +93,7 @@ Drupal.behaviors.nodequeueClear = {
       var table_id = $table.attr('id');
 
       // Mark nodes for removal.
-      $('#' + table_id + ' .node-position').each(function(i) {
+      $('#' + table_id + ' .nodequeue-position').each(function(i) {
         $(this).val('r');
       });
 
@@ -158,9 +158,9 @@ Drupal.behaviors.nodequeueClearTitle = {
 function nodequeueUpdateNodePositions(table_id) {
   // Check if reverse option is set.
   var reverse = Drupal.settings.nodequeue.reverse[table_id.replace(/-/g, '_')];
-  var size = reverse ? $('#' + table_id + ' .node-position').size() : 1;
+  var size = reverse ? $('#' + table_id + ' .nodequeue-position').size() : 1;
 
-  $('#' + table_id + ' tr').filter(":visible").find('.node-position').each(function(i) {
+  $('#' + table_id + ' tr').filter(":visible").find('.nodequeue-position').each(function(i) {
     $(this).val(size);
     reverse ? size-- : size++;
   });