diff --git a/src/Comparison/IfAnyHelper.php b/src/Comparison/IfAnyHelper.php
index 56314ac..57a9332 100644
--- a/src/Comparison/IfAnyHelper.php
+++ b/src/Comparison/IfAnyHelper.php
@@ -12,7 +12,7 @@ namespace JustBlackBird\HandlebarsHelpers\Comparison;
 
 use Handlebars\Context;
 use Handlebars\Helper as HelperInterface;
-use Handlebars\String;
+use Handlebars\StringWrapper;
 use Handlebars\Template;
 
 /**
@@ -48,10 +48,11 @@ class IfAnyHelper implements HelperInterface
         foreach ($parsed_args as $parsed_arg) {
             $value = $context->get($parsed_arg);
 
-            if ($value instanceof String) {
-                // Casting any object of \Handlebars\String will have false
-                // positive result even for those with empty internal strings.
-                // Thus we need to check internal string of such objects.
+            if ($value instanceof StringWrapper) {
+                // Casting any object of \Handlebars\StringWrapper will have
+                // false positive result even for those with empty internal
+                // strings. Thus we need to check internal string of such
+                // objects.
                 $value = $value->getString();
             }
 
diff --git a/src/Helpers.php b/src/Helpers.php
index 6cee712..479bd53 100644
--- a/src/Helpers.php
+++ b/src/Helpers.php
@@ -41,12 +41,12 @@ class Helpers extends BaseHelpers
         $this->add('ifOdd', new Comparison\IfOddHelper());
         $this->add('unlessEqual', new Comparison\UnlessEqualHelper());
 
-        // String helpers
-        $this->add('lowercase', new String\LowercaseHelper());
-        $this->add('uppercase', new String\UppercaseHelper());
-        $this->add('repeat', new String\RepeatHelper());
-        $this->add('replace', new String\ReplaceHelper());
-        $this->add('truncate', new String\TruncateHelper());
+        // Text helpers
+        $this->add('lowercase', new Text\LowercaseHelper());
+        $this->add('uppercase', new Text\UppercaseHelper());
+        $this->add('repeat', new Text\RepeatHelper());
+        $this->add('replace', new Text\ReplaceHelper());
+        $this->add('truncate', new Text\TruncateHelper());
 
         // Layout helpers
         $storage = new Layout\BlockStorage();
diff --git a/src/String/Helpers.php b/src/Text/Helpers.php
similarity index 94%
rename from src/String/Helpers.php
rename to src/Text/Helpers.php
index 341900c..08148d3 100644
--- a/src/String/Helpers.php
+++ b/src/Text/Helpers.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\String;
+namespace JustBlackBird\HandlebarsHelpers\Text;
 
 use Handlebars\Helpers as BaseHelpers;
 
diff --git a/src/String/LowercaseHelper.php b/src/Text/LowercaseHelper.php
similarity index 95%
rename from src/String/LowercaseHelper.php
rename to src/Text/LowercaseHelper.php
index 56e8dcc..0fa3689 100644
--- a/src/String/LowercaseHelper.php
+++ b/src/Text/LowercaseHelper.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\String;
+namespace JustBlackBird\HandlebarsHelpers\Text;
 
 use Handlebars\Context;
 use Handlebars\Helper as HelperInterface;
diff --git a/src/String/RepeatHelper.php b/src/Text/RepeatHelper.php
similarity index 96%
rename from src/String/RepeatHelper.php
rename to src/Text/RepeatHelper.php
index 0f7b0c7..01e8500 100644
--- a/src/String/RepeatHelper.php
+++ b/src/Text/RepeatHelper.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\String;
+namespace JustBlackBird\HandlebarsHelpers\Text;
 
 use Handlebars\Context;
 use Handlebars\Helper as HelperInterface;
diff --git a/src/String/ReplaceHelper.php b/src/Text/ReplaceHelper.php
similarity index 96%
rename from src/String/ReplaceHelper.php
rename to src/Text/ReplaceHelper.php
index 78bcaa5..11b6797 100644
--- a/src/String/ReplaceHelper.php
+++ b/src/Text/ReplaceHelper.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\String;
+namespace JustBlackBird\HandlebarsHelpers\Text;
 
 use Handlebars\Context;
 use Handlebars\Helper as HelperInterface;
diff --git a/src/String/TruncateHelper.php b/src/Text/TruncateHelper.php
similarity index 97%
rename from src/String/TruncateHelper.php
rename to src/Text/TruncateHelper.php
index 5ba474a..bc87e8d 100644
--- a/src/String/TruncateHelper.php
+++ b/src/Text/TruncateHelper.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\String;
+namespace JustBlackBird\HandlebarsHelpers\Text;
 
 use Handlebars\Context;
 use Handlebars\Helper as HelperInterface;
diff --git a/src/String/UppercaseHelper.php b/src/Text/UppercaseHelper.php
similarity index 95%
rename from src/String/UppercaseHelper.php
rename to src/Text/UppercaseHelper.php
index bed2253..e29077f 100644
--- a/src/String/UppercaseHelper.php
+++ b/src/Text/UppercaseHelper.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\String;
+namespace JustBlackBird\HandlebarsHelpers\Text;
 
 use Handlebars\Context;
 use Handlebars\Helper as HelperInterface;
diff --git a/tests/Comparison/IfAnyHelperTest.php b/tests/Comparison/IfAnyHelperTest.php
index e87eaac..997518d 100644
--- a/tests/Comparison/IfAnyHelperTest.php
+++ b/tests/Comparison/IfAnyHelperTest.php
@@ -61,7 +61,7 @@ class IfAnyHelperTest extends \PHPUnit_Framework_TestCase
                     'b' => null,
                     'c' => array(),
                     'd' => '',
-                    'e' => new \Handlebars\String(''),
+                    'e' => new \Handlebars\StringWrapper(''),
                 ),
                 'false',
             ),
diff --git a/tests/HelpersTest.php b/tests/HelpersTest.php
index ed6593a..8dd5bb9 100644
--- a/tests/HelpersTest.php
+++ b/tests/HelpersTest.php
@@ -53,12 +53,12 @@ class HelpersTest extends \PHPUnit_Framework_TestCase
             array('ifOdd', '\\JustBlackBird\\HandlebarsHelpers\\Comparison\\IfOddHelper'),
             array('unlessEqual', '\\JustBlackBird\\HandlebarsHelpers\\Comparison\\UnlessEqualHelper'),
 
-            // String helpers
-            array('lowercase', '\\JustBlackBird\\HandlebarsHelpers\\String\\LowercaseHelper'),
-            array('uppercase', '\\JustBlackBird\\HandlebarsHelpers\\String\\UppercaseHelper'),
-            array('repeat', '\\JustBlackBird\\HandlebarsHelpers\\String\\RepeatHelper'),
-            array('replace', '\\JustBlackBird\\HandlebarsHelpers\\String\\ReplaceHelper'),
-            array('truncate', '\\JustBlackBird\\HandlebarsHelpers\\String\\TruncateHelper'),
+            // Text helpers
+            array('lowercase', '\\JustBlackBird\\HandlebarsHelpers\\Text\\LowercaseHelper'),
+            array('uppercase', '\\JustBlackBird\\HandlebarsHelpers\\Text\\UppercaseHelper'),
+            array('repeat', '\\JustBlackBird\\HandlebarsHelpers\\Text\\RepeatHelper'),
+            array('replace', '\\JustBlackBird\\HandlebarsHelpers\\Text\\ReplaceHelper'),
+            array('truncate', '\\JustBlackBird\\HandlebarsHelpers\\Text\\TruncateHelper'),
 
             // Layout helpers
             array('block', '\\JustBlackBird\\HandlebarsHelpers\\Layout\\BlockHelper'),
diff --git a/tests/String/HelpersTest.php b/tests/Text/HelpersTest.php
similarity index 80%
rename from tests/String/HelpersTest.php
rename to tests/Text/HelpersTest.php
index 2b2cbe6..46b9f69 100644
--- a/tests/String/HelpersTest.php
+++ b/tests/Text/HelpersTest.php
@@ -8,12 +8,12 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\Tests\String;
+namespace JustBlackBird\HandlebarsHelpers\Tests\Text;
 
-use JustBlackBird\HandlebarsHelpers\String\Helpers;
+use JustBlackBird\HandlebarsHelpers\Text\Helpers;
 
 /**
- * Test class for String Helpers Set.
+ * Test class for Text Helpers Set.
  *
  * @author Dmitriy Simushev <simushevds@gmail.com>
  */
@@ -38,11 +38,11 @@ class HelpersTest extends \PHPUnit_Framework_TestCase
     public function helpersProvider()
     {
         return array(
-            array('lowercase', '\\JustBlackBird\\HandlebarsHelpers\\String\\LowercaseHelper'),
-            array('uppercase', '\\JustBlackBird\\HandlebarsHelpers\\String\\UppercaseHelper'),
-            array('repeat', '\\JustBlackBird\\HandlebarsHelpers\\String\\RepeatHelper'),
-            array('replace', '\\JustBlackBird\\HandlebarsHelpers\\String\\ReplaceHelper'),
-            array('truncate', '\\JustBlackBird\\HandlebarsHelpers\\String\\TruncateHelper'),
+            array('lowercase', '\\JustBlackBird\\HandlebarsHelpers\\Text\\LowercaseHelper'),
+            array('uppercase', '\\JustBlackBird\\HandlebarsHelpers\\Text\\UppercaseHelper'),
+            array('repeat', '\\JustBlackBird\\HandlebarsHelpers\\Text\\RepeatHelper'),
+            array('replace', '\\JustBlackBird\\HandlebarsHelpers\\Text\\ReplaceHelper'),
+            array('truncate', '\\JustBlackBird\\HandlebarsHelpers\\Text\\TruncateHelper'),
         );
     }
 }
diff --git a/tests/String/LowercaseHelperTest.php b/tests/Text/LowercaseHelperTest.php
similarity index 94%
rename from tests/String/LowercaseHelperTest.php
rename to tests/Text/LowercaseHelperTest.php
index 5b0acf1..f6151ba 100644
--- a/tests/String/LowercaseHelperTest.php
+++ b/tests/Text/LowercaseHelperTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\Tests\String;
+namespace JustBlackBird\HandlebarsHelpers\Tests\Text;
 
-use JustBlackBird\HandlebarsHelpers\String\LowercaseHelper;
+use JustBlackBird\HandlebarsHelpers\Text\LowercaseHelper;
 
 /**
  * Test class for "lowercase" helper.
diff --git a/tests/String/RepeatHelperTest.php b/tests/Text/RepeatHelperTest.php
similarity index 95%
rename from tests/String/RepeatHelperTest.php
rename to tests/Text/RepeatHelperTest.php
index 09ca6cf..21d073a 100644
--- a/tests/String/RepeatHelperTest.php
+++ b/tests/Text/RepeatHelperTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\Tests\String;
+namespace JustBlackBird\HandlebarsHelpers\Tests\Text;
 
-use JustBlackBird\HandlebarsHelpers\String\RepeatHelper;
+use JustBlackBird\HandlebarsHelpers\Text\RepeatHelper;
 
 /**
  * Test class for "repeat" helper.
diff --git a/tests/String/ReplaceHelperTest.php b/tests/Text/ReplaceHelperTest.php
similarity index 95%
rename from tests/String/ReplaceHelperTest.php
rename to tests/Text/ReplaceHelperTest.php
index 723414b..bb128c3 100644
--- a/tests/String/ReplaceHelperTest.php
+++ b/tests/Text/ReplaceHelperTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\Tests\String;
+namespace JustBlackBird\HandlebarsHelpers\Tests\Text;
 
-use JustBlackBird\HandlebarsHelpers\String\ReplaceHelper;
+use JustBlackBird\HandlebarsHelpers\Text\ReplaceHelper;
 
 /**
  * Test class for "replace" helper.
diff --git a/tests/String/TruncateHelperTest.php b/tests/Text/TruncateHelperTest.php
similarity index 96%
rename from tests/String/TruncateHelperTest.php
rename to tests/Text/TruncateHelperTest.php
index 1087fbf..b444511 100644
--- a/tests/String/TruncateHelperTest.php
+++ b/tests/Text/TruncateHelperTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\Tests\String;
+namespace JustBlackBird\HandlebarsHelpers\Tests\Text;
 
-use JustBlackBird\HandlebarsHelpers\String\TruncateHelper;
+use JustBlackBird\HandlebarsHelpers\Text\TruncateHelper;
 
 /**
  * Test class for "truncate" helper.
diff --git a/tests/String/UppercaseHelperTest.php b/tests/Text/UppercaseHelperTest.php
similarity index 94%
rename from tests/String/UppercaseHelperTest.php
rename to tests/Text/UppercaseHelperTest.php
index cb33cc7..c4883bf 100644
--- a/tests/String/UppercaseHelperTest.php
+++ b/tests/Text/UppercaseHelperTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-namespace JustBlackBird\HandlebarsHelpers\Tests\String;
+namespace JustBlackBird\HandlebarsHelpers\Tests\Text;
 
-use JustBlackBird\HandlebarsHelpers\String\UppercaseHelper;
+use JustBlackBird\HandlebarsHelpers\Text\UppercaseHelper;
 
 /**
  * Test class for "uppercase" helper.