diff --git a/Controller/ImagineController.php b/Controller/ImagineController.php
index 94f92aa7c..9eb7d9ff4 100644
--- a/Controller/ImagineController.php
+++ b/Controller/ImagineController.php
@@ -1,37 +1,37 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\Controller;
+namespace Liip\ImagineBundle\Controller;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver;
-use Avalanche\Bundle\ImagineBundle\Imagine\DataLoader\LoaderInterface;
-use Avalanche\Bundle\ImagineBundle\Imagine\Filter\FilterManager;
+use Liip\ImagineBundle\Imagine\CachePathResolver;
+use Liip\ImagineBundle\Imagine\DataLoader\LoaderInterface;
+use Liip\ImagineBundle\Imagine\Filter\FilterManager;
 
 class ImagineController
 {
     /**
-     * @var Avalanche\Bundle\ImagineBundle\Imagine\DataLoader\LoaderInterface
+     * @var Liip\ImagineBundle\Imagine\DataLoader\LoaderInterface
      */
     private $dataLoader;
 
     /**
-     * @var Avalanche\Bundle\ImagineBundle\Imagine\Filter\FilterManager
+     * @var Liip\ImagineBundle\Imagine\Filter\FilterManager
      */
     private $filterManager;
 
     /**
-     * @var Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver
+     * @var Liip\ImagineBundle\Imagine\CachePathResolver
      */
     private $cachePathResolver;
 
     /**
      * Constructor
      *
-     * @param Avalanche\Bundle\ImagineBundle\Imagine\DataLoader\LoaderInterface $dataLoader
-     * @param Avalanche\Bundle\ImagineBundle\Imagine\Filter\FilterManager       $filterManager
-     * @param Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver          $cachePathResolver
+     * @param Liip\ImagineBundle\Imagine\DataLoader\LoaderInterface $dataLoader
+     * @param Liip\ImagineBundle\Imagine\Filter\FilterManager       $filterManager
+     * @param Liip\ImagineBundle\Imagine\CachePathResolver          $cachePathResolver
      */
     public function __construct(LoaderInterface $dataLoader, FilterManager $filterManager, CachePathResolver $cachePathResolver = null)
     {
diff --git a/DependencyInjection/Compiler/CreateCacheDirectoriesCompilerPass.php b/DependencyInjection/Compiler/CreateCacheDirectoriesCompilerPass.php
index a596de68f..cda91a605 100644
--- a/DependencyInjection/Compiler/CreateCacheDirectoriesCompilerPass.php
+++ b/DependencyInjection/Compiler/CreateCacheDirectoriesCompilerPass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\DependencyInjection\Compiler;
+namespace Liip\ImagineBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/DependencyInjection/Compiler/LoadersCompilerPass.php b/DependencyInjection/Compiler/LoadersCompilerPass.php
index f9a30211b..b5b50c807 100644
--- a/DependencyInjection/Compiler/LoadersCompilerPass.php
+++ b/DependencyInjection/Compiler/LoadersCompilerPass.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\DependencyInjection\Compiler;
+namespace Liip\ImagineBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 7ac259ad1..e872162d5 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\DependencyInjection;
+namespace Liip\ImagineBundle\DependencyInjection;
 
 use Symfony\Component\Config\Definition\Builder\TreeBuilder,
     Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -15,7 +15,7 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('avalanche_imagine', 'array');
+        $rootNode = $treeBuilder->root('liip_imagine', 'array');
 
         $rootNode
             ->fixXmlConfig('format', 'formats')
diff --git a/DependencyInjection/AvalancheImagineExtension.php b/DependencyInjection/LiipImagineExtension.php
similarity index 94%
rename from DependencyInjection/AvalancheImagineExtension.php
rename to DependencyInjection/LiipImagineExtension.php
index 542b225e5..720a6d538 100644
--- a/DependencyInjection/AvalancheImagineExtension.php
+++ b/DependencyInjection/LiipImagineExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\DependencyInjection;
+namespace Liip\ImagineBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Alias;
@@ -9,7 +9,7 @@
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Reference;
 
-class AvalancheImagineExtension extends Extension
+class LiipImagineExtension extends Extension
 {
     /**
      * @see Symfony\Component\DependencyInjection\Extension.ExtensionInterface::load()
diff --git a/Imagine/CachePathResolver.php b/Imagine/CachePathResolver.php
index 198e05e40..88623707c 100644
--- a/Imagine/CachePathResolver.php
+++ b/Imagine/CachePathResolver.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\Imagine;
+namespace Liip\ImagineBundle\Imagine;
 
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/Imagine/DataLoader/FileSystemLoader.php b/Imagine/DataLoader/FileSystemLoader.php
index f448dac60..c6fe6ee62 100644
--- a/Imagine/DataLoader/FileSystemLoader.php
+++ b/Imagine/DataLoader/FileSystemLoader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\Imagine\DataLoader;
+namespace Liip\ImagineBundle\Imagine\DataLoader;
 
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
diff --git a/Imagine/DataLoader/LoaderInterface.php b/Imagine/DataLoader/LoaderInterface.php
index e7405c2aa..62bb8a3e6 100644
--- a/Imagine/DataLoader/LoaderInterface.php
+++ b/Imagine/DataLoader/LoaderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\Imagine\DataLoader;
+namespace Liip\ImagineBundle\Imagine\DataLoader;
 
 interface LoaderInterface
 {
diff --git a/Imagine/Filter/FilterManager.php b/Imagine/Filter/FilterManager.php
index 8951125bb..96ae773f0 100644
--- a/Imagine/Filter/FilterManager.php
+++ b/Imagine/Filter/FilterManager.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\Imagine\Filter;
+namespace Liip\ImagineBundle\Imagine\Filter;
 
-use Avalanche\Bundle\ImagineBundle\Imagine\Filter\Loader\LoaderInterface;
+use Liip\ImagineBundle\Imagine\Filter\Loader\LoaderInterface;
 
 use Imagine\Exception\InvalidArgumentException;
 use Imagine\Filter\FilterInterface;
diff --git a/Imagine/Filter/Loader/LoaderInterface.php b/Imagine/Filter/Loader/LoaderInterface.php
index 6f4cd99d6..b834ae5d0 100644
--- a/Imagine/Filter/Loader/LoaderInterface.php
+++ b/Imagine/Filter/Loader/LoaderInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\Imagine\Filter\Loader;
+namespace Liip\ImagineBundle\Imagine\Filter\Loader;
 
 use Imagine\Image\ImageInterface;
 
diff --git a/Imagine/Filter/Loader/ThumbnailFilterLoader.php b/Imagine/Filter/Loader/ThumbnailFilterLoader.php
index 9cc2c3f5d..efdc6a22e 100644
--- a/Imagine/Filter/Loader/ThumbnailFilterLoader.php
+++ b/Imagine/Filter/Loader/ThumbnailFilterLoader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\Imagine\Filter\Loader;
+namespace Liip\ImagineBundle\Imagine\Filter\Loader;
 
 use Imagine\Image\Box;
 use Imagine\Filter\Basic\Thumbnail;
diff --git a/AvalancheImagineBundle.php b/LiipImagineBundle.php
similarity index 68%
rename from AvalancheImagineBundle.php
rename to LiipImagineBundle.php
index 828ca3117..c0ed338b3 100644
--- a/AvalancheImagineBundle.php
+++ b/LiipImagineBundle.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle;
+namespace Liip\ImagineBundle;
 
-use Avalanche\Bundle\ImagineBundle\DependencyInjection\Compiler\LoadersCompilerPass;
+use Liip\ImagineBundle\DependencyInjection\Compiler\LoadersCompilerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class AvalancheImagineBundle extends Bundle
+class LiipImagineBundle extends Bundle
 {
     /**
      * @see Symfony\Component\HttpKernel\Bundle.Bundle::build()
diff --git a/README.md b/README.md
index 96a99eaff..0f0dc50c7 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,14 @@
-AvalancheImagineBundle
-======================
+LiipImagineBundle
+=================
 
-This bundle provides easy image manipulation support for Symfony2. For example,
-with this bundle, the following is possible:
+This bundle is a fork of AvalancheImagineBundle which provides easy image
+manipulation support for Symfony2. The goal of the fork is to make the
+code more extensible and as a result applicable for more use cases.
+
+For more details on the reason for the fork see:
+https://github.com/avalanche123/AvalancheImagineBundle/pull/25
+
+For example with this bundle the following is possible:
 
 ``` jinja
 <img src="{{ '/relative/path/to/image.jpg' | apply_filter('thumbnail') }}" />
@@ -29,9 +35,9 @@ add the following entries to the `deps` in the root of your project file:
     git=http://github.com/avalanche123/Imagine.git
     target=imagine
 
-[AvalancheImagineBundle]
-    git=http://github.com/avalanche123/AvalancheImagineBundle.git
-    target=bundles/Avalanche/Bundle/ImagineBundle
+[LiipImagineBundle]
+    git=http://github.com/liip/LiipImagineBundle.git
+    target=bundles/Liip/ImagineBundle
 ```
 
 **NOTE**: This location and syntax of the `deps` file changed after BETA4. If you're
@@ -49,17 +55,17 @@ Great! Now skip down to *Step 2*.
 ### Step 1 (alternative): Installation with submodules
 
 If you're managing your vendor libraries with submodules, first create the
-`vendor/bundles/Avalanche/Bundle` directory:
+`vendor/bundles/Liip` directory:
 
 ``` bash
-$ mkdir -pv vendor/bundles/Avalanche/Bundle
+$ mkdir -pv vendor/bundles/Liip
 ```
 
 Next, add the two necessary submodules:
 
 ``` bash
 $ git submodule add git://github.com/avalanche123/Imagine.git vendor/imagine
-$ git submodule add git://github.com/avalanche123/AvalancheImagineBundle.git vendor/bundles/Avalanche/Bundle/ImagineBundle
+$ git submodule add git://github.com/liip/LiipImagineBundle.git vendor/bundles/Liip/ImagineBundle
 ```
 
 ### Step2: Configure the autoloader
@@ -73,8 +79,8 @@ Add the following entries to your autoloader:
 $loader->registerNamespaces(array(
     // ...
 
-    'Imagine'          => __DIR__.'/../vendor/imagine/lib',
-    'Avalanche'        => __DIR__.'/../vendor/bundles',
+    'Imagine'   => __DIR__.'/../vendor/imagine/lib',
+    'Liip'      => __DIR__.'/../vendor/bundles',
 ));
 ```
 
@@ -91,7 +97,7 @@ public function registerBundles()
     $bundles = array(
         // ...
 
-        new Avalanche\Bundle\ImagineBundle\AvalancheImagineBundle(),
+        new Liip\ImagineBundle\LiipImagineBundle(),
     );
 }
 ```
@@ -120,7 +126,7 @@ you want to thumbnail an image to a size of 120x90 pixels:
 ``` yaml
 # app/config/config.yml
 
-avalanche_imagine:
+liip_imagine:
     filters:
         my_thumb:
             type:    thumbnail
@@ -154,7 +160,7 @@ would save the filtered image file.
 The default configuration for the bundle looks like this:
 
 ``` yaml
-avalanche_imagine:
+liip_imagine:
     web_root:     %kernel.root_dir%/../web
     cache_prefix: /media/cache
     cache:        true
@@ -223,7 +229,7 @@ The `mode` can be either `outbound` or `inset`.
 The ImagineBundle allows you to load your own custom filter classes. The only
 requirement is that each filter loader implement the following interface:
 
-    Avalanche\Bundle\ImagineBundle\Imagine\Filter\Loader\LoaderInterface
+    Liip\ImagineBundle\Imagine\Filter\Loader\LoaderInterface
 
 To tell the bundle about your new filter loader, register it in the service
 container and apply the following tag to it (example here in XML):
@@ -246,4 +252,4 @@ filters:
 ```
 
 For an example of a filter loader implementation, refer to
-`Avalanche\Bundle\ImagineBundle\Imagine\Filter\Loader\ThumbnailFilterLoader`.
+`Liip\ImagineBundle\Imagine\Filter\Loader\ThumbnailFilterLoader`.
diff --git a/Resources/config/imagine.xml b/Resources/config/imagine.xml
index 9a55f8b6f..4094ec9c5 100644
--- a/Resources/config/imagine.xml
+++ b/Resources/config/imagine.xml
@@ -7,22 +7,22 @@
 
         <!-- Utility classes -->
 
-        <parameter key="imagine.filter.manager.class">Avalanche\Bundle\ImagineBundle\Imagine\Filter\FilterManager</parameter>
-        <parameter key="imagine.cache.path.resolver.class">Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver</parameter>
-        <parameter key="imagine.loader.filesystem.class">Avalanche\Bundle\ImagineBundle\Imagine\DataLoader\FileSystemLoader</parameter>
+        <parameter key="imagine.filter.manager.class">Liip\ImagineBundle\Imagine\Filter\FilterManager</parameter>
+        <parameter key="imagine.cache.path.resolver.class">Liip\ImagineBundle\Imagine\CachePathResolver</parameter>
+        <parameter key="imagine.loader.filesystem.class">Liip\ImagineBundle\Imagine\DataLoader\FileSystemLoader</parameter>
 
         <!-- Controller class -->
 
-        <parameter key="imagine.controller.class">Avalanche\Bundle\ImagineBundle\Controller\ImagineController</parameter>
+        <parameter key="imagine.controller.class">Liip\ImagineBundle\Controller\ImagineController</parameter>
 
         <!-- Route loader class -->
 
-        <parameter key="imagine.routing.loader.class">Avalanche\Bundle\ImagineBundle\Routing\ImagineLoader</parameter>
+        <parameter key="imagine.routing.loader.class">Liip\ImagineBundle\Routing\ImagineLoader</parameter>
 
         <!-- Templating classes -->
 
-        <parameter key="imagine.twig.extension.class">Avalanche\Bundle\ImagineBundle\Templating\ImagineExtension</parameter>
-        <parameter key="imagine.templating.helper.class">Avalanche\Bundle\ImagineBundle\Templating\Helper\ImagineHelper</parameter>
+        <parameter key="imagine.twig.extension.class">Liip\ImagineBundle\Templating\ImagineExtension</parameter>
+        <parameter key="imagine.templating.helper.class">Liip\ImagineBundle\Templating\Helper\ImagineHelper</parameter>
 
         <!-- ImagineInterface implementations -->
 
@@ -32,7 +32,7 @@
 
         <!-- Filter loaders' classes -->
 
-        <parameter key="imagine.filter.loader.thumbnail.class">Avalanche\Bundle\ImagineBundle\Imagine\Filter\Loader\ThumbnailFilterLoader</parameter>
+        <parameter key="imagine.filter.loader.thumbnail.class">Liip\ImagineBundle\Imagine\Filter\Loader\ThumbnailFilterLoader</parameter>
 
     </parameters>
 
diff --git a/Routing/ImagineLoader.php b/Routing/ImagineLoader.php
index ab2fda7bd..1e9c15768 100644
--- a/Routing/ImagineLoader.php
+++ b/Routing/ImagineLoader.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\Routing;
+namespace Liip\ImagineBundle\Routing;
 
 use Symfony\Component\Routing\Route;
 
diff --git a/Templating/Helper/ImagineHelper.php b/Templating/Helper/ImagineHelper.php
index 1849a5c21..89e4e83a2 100644
--- a/Templating/Helper/ImagineHelper.php
+++ b/Templating/Helper/ImagineHelper.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\Templating\Helper;
+namespace Liip\ImagineBundle\Templating\Helper;
 
-use Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver;
+use Liip\ImagineBundle\Imagine\CachePathResolver;
 use Symfony\Component\Templating\Helper\Helper;
 
 class ImagineHelper extends Helper
 {
     /**
-     * @var Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver
+     * @var Liip\ImagineBundle\Imagine\CachePathResolver
      */
     private $cachePathResolver;
 
     /**
      * Constructs by setting $cachePathResolver
      *
-     * @param Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver $cachePathResolver
+     * @param Liip\ImagineBundle\Imagine\CachePathResolver $cachePathResolver
      */
     public function __construct(CachePathResolver $cachePathResolver)
     {
diff --git a/Templating/ImagineExtension.php b/Templating/ImagineExtension.php
index 90ca6ea46..49e4a1006 100644
--- a/Templating/ImagineExtension.php
+++ b/Templating/ImagineExtension.php
@@ -1,21 +1,21 @@
 <?php
 
-namespace Avalanche\Bundle\ImagineBundle\Templating;
+namespace Liip\ImagineBundle\Templating;
 
-use Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver;
+use Liip\ImagineBundle\Imagine\CachePathResolver;
 use Symfony\Component\HttpKernel\Util\Filesystem;
 
 class ImagineExtension extends \Twig_Extension
 {
     /**
-     * @var Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver
+     * @var Liip\ImagineBundle\Imagine\CachePathResolver
      */
     private $cachePathResolver;
 
     /**
      * Constructs by setting $cachePathResolver
      *
-     * @param Avalanche\Bundle\ImagineBundle\Imagine\CachePathResolver $cachePathResolver
+     * @param Liip\ImagineBundle\Imagine\CachePathResolver $cachePathResolver
      */
     public function __construct(CachePathResolver $cachePathResolver)
     {
diff --git a/Tests/DependencyInjection/AvalancheImagineExtensionTest.php b/Tests/DependencyInjection/LiipImagineExtensionTest.php
similarity index 92%
rename from Tests/DependencyInjection/AvalancheImagineExtensionTest.php
rename to Tests/DependencyInjection/LiipImagineExtensionTest.php
index cb142b5a5..106efdaf0 100644
--- a/Tests/DependencyInjection/AvalancheImagineExtensionTest.php
+++ b/Tests/DependencyInjection/LiipImagineExtensionTest.php
@@ -9,14 +9,14 @@
  * file that was distributed with this source code.
  */
 
-namespace Avalanche\Bundle\ImagineBundle\Tests\DependencyInjection;
+namespace Liip\ImagineBundle\Tests\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Avalanche\Bundle\ImagineBundle\DependencyInjection\AvalancheImagineExtension;
+use Liip\ImagineBundle\DependencyInjection\LiipImagineExtension;
 use Symfony\Component\Yaml\Parser;
 use Symfony\Component\DependencyInjection\Reference;
 
-class AvalancheImagineExtensionTest extends \PHPUnit_Framework_TestCase
+class LiipImagineExtensionTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @var \Symfony\Component\DependencyInjection\ContainerBuilder
@@ -28,7 +28,7 @@ class AvalancheImagineExtensionTest extends \PHPUnit_Framework_TestCase
      */
     public function testUserLoadThrowsExceptionUnlessDriverIsValid()
     {
-        $loader = new AvalancheImagineExtension();
+        $loader = new LiipImagineExtension();
         $config = array('driver' => 'foo');
         $loader->load(array($config), new ContainerBuilder());
     }
@@ -65,7 +65,7 @@ public function testLoad()
     protected function createEmptyConfiguration()
     {
         $this->containerBuilder = new ContainerBuilder();
-        $loader = new AvalancheImagineExtension();
+        $loader = new LiipImagineExtension();
         $loader->load(array(array()), $this->containerBuilder);
         $this->assertTrue($this->containerBuilder instanceof ContainerBuilder);
     }
@@ -76,7 +76,7 @@ protected function createEmptyConfiguration()
     protected function createFullConfiguration()
     {
         $this->containerBuilder = new ContainerBuilder();
-        $loader = new AvalancheImagineExtension();
+        $loader = new LiipImagineExtension();
         $loader->load(array($this->getFullConfig()), $this->containerBuilder);
         $this->assertTrue($this->containerBuilder instanceof ContainerBuilder);
     }
diff --git a/Tests/bootstrap.php b/Tests/bootstrap.php
index b52ec5c1e..56c074c0e 100644
--- a/Tests/bootstrap.php
+++ b/Tests/bootstrap.php
@@ -2,8 +2,8 @@
 
 spl_autoload_register(function($class) {
     $class = ltrim($class, '\\');
-    if (0 === strpos($class, 'Avalanche\Bundle\ImagineBundle\\')) {
-        $file = __DIR__.'/../'.str_replace('\\', '/', substr($class, strlen('Avalanche\Bundle\ImagineBundle\\'))).'.php';
+    if (0 === strpos($class, 'Liip\ImagineBundle\\')) {
+        $file = __DIR__.'/../'.str_replace('\\', '/', substr($class, strlen('Liip\ImagineBundle\\'))).'.php';
         if (file_exists($file)) {
             require $file;
         }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 1380396d4..e13f96dc5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,7 +12,7 @@
          bootstrap="Tests/bootstrap.php"
 >
     <testsuites>
-        <testsuite name="AvalancheImagineBundle Test Suite">
+        <testsuite name="LiipImagineBundle Test Suite">
             <directory>./Tests/</directory>
         </testsuite>
     </testsuites>