diff --git a/composer.json b/composer.json
index 7e0f201..40fc62b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,8 @@
 {
-  "name": "echo511/plupload",
+  "name": "irkallacz/plupload",
   "type": "library",
   "description": "Plupload component for Nette Framework.",
-  "keywords": [
-    "echo511",
+  "keywords": [ 
     "nette",
     "plupload"
   ],
diff --git a/src/Echo511/Plupload/DI/PluploadExtension.php b/src/Echo511/Plupload/DI/PluploadExtension.php
index 3881cab..17da326 100644
--- a/src/Echo511/Plupload/DI/PluploadExtension.php
+++ b/src/Echo511/Plupload/DI/PluploadExtension.php
@@ -21,10 +21,8 @@ class PluploadExtension extends CompilerExtension
 	 */
 	public function loadConfiguration()
 	{
-		$builder = $this->getContainerBuilder();
 		$config = $this->loadFromFile(__DIR__ . '/../config/plupload.neon');
-		$namespace = 'Echo511.Plupload.DI';
-		$this->compiler->parseServices($builder, $config, $namespace);
+		$this->compiler->loadDefinitionsFromConfig($config['services']);
 	}
 
 
diff --git a/src/Echo511/Plupload/config/plupload.neon b/src/Echo511/Plupload/config/plupload.neon
index 9e94dd9..89e07ff 100644
--- a/src/Echo511/Plupload/config/plupload.neon
+++ b/src/Echo511/Plupload/config/plupload.neon
@@ -1,19 +1,19 @@
 services:    
     control:
-        class: Echo511\Plupload\Control\PluploadControl
+        factory: Echo511\Plupload\Control\PluploadControl
         implement: Echo511\Plupload\Control\IPluploadControlFactory
 
     uploader:
-        class: Echo511\Plupload\Service\Uploader(%tempDir%/echo511.plupload)
+        factory: Echo511\Plupload\Service\Uploader(%tempDir%/echo511.plupload)
 
     uploadQueue:
-        class: Echo511\Plupload\Entity\UploadQueue
+        factory: Echo511\Plupload\Entity\UploadQueue
         implement: Echo511\Plupload\Entity\IUploadQueueFactory
         parameters: [id]
         arguments: [%id%]
 
     upload:
-        class: Echo511\Plupload\Entity\Upload
+        factory: Echo511\Plupload\Entity\Upload
         implement: Echo511\Plupload\Entity\IUploadFactory
         parameters: [filename, name]
-        arguments: [%filename%, %name%]
\ No newline at end of file
+        arguments: [%filename%, %name%]
diff --git a/src/Echo511/Plupload/templates/control/plupload.latte b/src/Echo511/Plupload/templates/control/plupload.latte
index b41de23..44808c0 100644
--- a/src/Echo511/Plupload/templates/control/plupload.latte
+++ b/src/Echo511/Plupload/templates/control/plupload.latte
@@ -2,7 +2,7 @@
     <p>Your browser doesn't have Flash, Silverlight or HTML5 support.</p>
 </div>
 
-<script type="text/javascript">	
+<script type="text/javascript" n:nonce>	
 $(function() {
     $("#{$id|noescape}uploader").plupload({
         runtimes : 'html5',
@@ -46,4 +46,4 @@ $(function() {
     });
 
 });
-</script>
\ No newline at end of file
+</script>