diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index 54bb649..2116932 100644
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -46,7 +46,7 @@
 {%- endblock -%}
 
 {%- block sidebar -%}
-    {{ render(controller('SkobkinCopyPasteBundle:CopyPaste:sidebar')) }}
+    {{ render(controller('SkobkinCopyPasteBundle:Paste:sidebar')) }}
 {%- endblock -%}
 
 {% block content %}{% endblock %}
diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Controller/CopypasteController.php b/src/Skobkin/Bundle/CopyPasteBundle/Controller/PasteController.php
similarity index 98%
rename from src/Skobkin/Bundle/CopyPasteBundle/Controller/CopypasteController.php
rename to src/Skobkin/Bundle/CopyPasteBundle/Controller/PasteController.php
index dcabd8a..049f311 100644
--- a/src/Skobkin/Bundle/CopyPasteBundle/Controller/CopypasteController.php
+++ b/src/Skobkin/Bundle/CopyPasteBundle/Controller/PasteController.php
@@ -12,11 +12,7 @@ use Skobkin\Bundle\CopyPasteBundle\Form\CopypasteType;
 use DT\Bundle\GeshiBundle\Highlighter\GeshiHighlighter;
 use \GeSHi\GeSHi;
 
-/**
- * Copypaste controller.
- *
- */
-class CopypasteController extends Controller
+class PasteController extends Controller
 {
 
     /**
diff --git a/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml b/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml
index 45938d3..c26de88 100644
--- a/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml
+++ b/src/Skobkin/Bundle/CopyPasteBundle/Resources/config/routing/copypaste.yml
@@ -1,21 +1,21 @@
 copypaste_show_public:
     path:     /{id}
-    defaults: { _controller: "SkobkinCopyPasteBundle:Copypaste:show", secret: null }
+    defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::showAction', secret: null }
     requirements:
         id:  \d+
         
 copypaste_show_private:
     path:     /{id}/{secret}
-    defaults: { _controller: "SkobkinCopyPasteBundle:Copypaste:show" }
+    defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::showAction' }
     requirements:
         id:  \d+
         secret: \w{16}
 
 copypaste_new:
     path:     /
-    defaults: { _controller: "SkobkinCopyPasteBundle:Copypaste:new" }
+    defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::newAction' }
 
 copypaste_create:
     path:     /create
-    defaults: { _controller: "SkobkinCopyPasteBundle:Copypaste:create" }
+    defaults: { _controller: 'Skobkin\Bundle\CopyPasteBundle\Controller\PasteController::createAction' }
     methods:  POST
\ No newline at end of file