diff --git a/select2.js b/select2.js
index 43b3f2ec..95a9ee98 100755
--- a/select2.js
+++ b/select2.js
@@ -535,8 +535,8 @@
             }
 
             //Custom tags separator.
-            opts.tagSeparator = opts.tagSeparator || ",";
-            
+            opts.separator = opts.separator || ",";
+
             if (select) {
                 // these options are not allowed when attached to a select because they are picked up off the element itself
                 $.each(["id", "multiple", "ajax", "query", "createSearchChoice", "initSelection", "data", "tags"], function () {
@@ -666,7 +666,7 @@
                         opts.createSearchChoice = function (term) { return {id: term, text: term}; };
                         opts.initSelection = function (element, callback) {
                             var data = [];
-                            $(splitVal(element.val(), opts.tagSeparator)).each(function () {
+                            $(splitVal(element.val(), opts.separator)).each(function () {
                                 data.push({id: this, text: this});
                             });
 
@@ -1470,7 +1470,7 @@
             opts = $.extend({}, {
                 closeOnSelect: true
             }, opts);
-            
+
             // TODO validate placeholder is a string if specified
 
             if (opts.element.get(0).tagName.toLowerCase() === "select") {
@@ -1830,7 +1830,7 @@
                 return val === null ? [] : val;
             } else {
                 val = this.opts.element.val();
-                return splitVal(val, this.opts.tagSeparator);
+                return splitVal(val, this.opts.separator);
             }
         },