diff --git a/src/shapes/Text.js b/src/shapes/Text.js
index 39c25c19..7b410899 100644
--- a/src/shapes/Text.js
+++ b/src/shapes/Text.js
@@ -21,7 +21,7 @@
         WORD = 'word',
         CHAR = 'char',
         NONE = 'none',
-        ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'align', 'lineHeight', 'text', 'width', 'height', 'wrapping'],
+        ATTR_CHANGE_LIST = ['fontFamily', 'fontSize', 'fontStyle', 'padding', 'align', 'lineHeight', 'text', 'width', 'height', 'wrap'],
         
         // cached variables
         attrChangeListLen = ATTR_CHANGE_LIST.length,
@@ -41,7 +41,7 @@
      * @param {Number} [config.width] default is auto
      * @param {Number} [config.height] default is auto
      * @param {Number} [config.lineHeight] default is 1
-     * @param {String} [config.wrapping] can be word, char, or none. Default is word
+     * @param {String} [config.wrap] can be word, char, or none. Default is word
      * {{ShapeParams}}
      * {{NodeParams}}
      */
@@ -229,9 +229,9 @@
                  fixedHeight = height !== AUTO,
                  maxHeightPx = height - this.getPadding() * 2,
                  currentHeightPx = 0,
-                 wrapping = this.getWrapping(),
-                 shouldWrap = wrapping !== NONE,
-                 wrapAtWord = wrapping !==  CHAR && shouldWrap;
+                 wrap = this.getWrap(),
+                 shouldWrap = wrap !== NONE,
+                 wrapAtWord = wrap !==  CHAR && shouldWrap;
 
              this.textArr = [];
              dummyContext.save();
@@ -322,7 +322,7 @@
     Kinetic.Node.addGetterSetter(Kinetic.Text, 'padding', 0);
     Kinetic.Node.addGetterSetter(Kinetic.Text, 'align', LEFT);
     Kinetic.Node.addGetterSetter(Kinetic.Text, 'lineHeight', 1);
-    Kinetic.Node.addGetterSetter(Kinetic.Text, 'wrapping', NONE);
+    Kinetic.Node.addGetterSetter(Kinetic.Text, 'wrap', NONE);
 
     Kinetic.Node.addGetter(Kinetic.Text, TEXT, EMPTY_STRING);
     
diff --git a/tests/js/unit/shapes/textTests.js b/tests/js/unit/shapes/textTests.js
index 5e79ef50..fc39ba7f 100644
--- a/tests/js/unit/shapes/textTests.js
+++ b/tests/js/unit/shapes/textTests.js
@@ -186,7 +186,7 @@ Test.Modules.Text = {
             padding: 0,
             align: 'center',
             draggable: true,
-            wrapping: 'WORD'
+            wrap: 'WORD'
         });
 
         // center text box
@@ -395,7 +395,7 @@ Test.Modules.Text = {
             fontSize: 15,
             fontFamily: 'Calibri',
             fill: '#000',
-            wrapping: 'word'
+            wrap: 'word'
         });
 
         layer.add(text);
@@ -403,11 +403,11 @@ Test.Modules.Text = {
 
         warn(layer.toDataURL() === dataUrls['wrapped text']['wrapping to words'], 'text should be wrapped to words');
 
-        text.setWrapping('none');
+        text.setWrap('none');
         layer.draw();
         warn(layer.toDataURL() === dataUrls['wrapped text']['no wrapping'], 'text should not be wrapped');
 
-        text.setWrapping('char');
+        text.setWrap('char');
         layer.draw();
         warn(layer.toDataURL() === dataUrls['wrapped text']['wrapping to chars'], 'text should be wrapped to chars');