diff --git a/developer_manual/app/appframework/templates.rst b/developer_manual/app/appframework/templates.rst
index fc0339559..688bd1106 100644
--- a/developer_manual/app/appframework/templates.rst
+++ b/developer_manual/app/appframework/templates.rst
@@ -74,7 +74,7 @@ The App Framework comes with additional template functions for Twig to better in
 
 
 .. js:function:: url(route, params=null)
-  
+
   :param string route: the name of the route
   :param string params: the params written like a JavaScript object
 
@@ -84,11 +84,11 @@ The App Framework comes with additional template functions for Twig to better in
 
   .. code-block:: js
 
-    {{ url('apptemplate_advanced_params', {value: 'hi'}) }}
+    {{ url('yourapp_route_name', {value: 'hi'}) }}
 
 
 .. js:function:: abs_url(route, params=null)
-  
+
   :param string route: the name of the route
   :param string params: the params written like a JavaScript object
 
@@ -98,11 +98,11 @@ The App Framework comes with additional template functions for Twig to better in
 
   .. code-block:: js
 
-    {{ abs_url('apptemplate_advanced_params', {value: 'hi'}) }}
+    {{ abs_url('yourapp_route_name', {value: 'hi'}) }}
 
 
 .. js:function:: trans(toTranslate, params=null)
-  
+
   :param string toTranslate: the string which should be translated
   :param string params: the params that should be replaced in the string
 
@@ -116,7 +116,7 @@ The App Framework comes with additional template functions for Twig to better in
 
 
 .. js:function:: script(path, appName=null)
-  
+
   :param string path: path to the JavaScript file in the **js/** folder in the app. The **.js** extension is automatically added.
   :param string appName: name of the app. If no value is given, the current app will be used.
 
@@ -133,7 +133,7 @@ The App Framework comes with additional template functions for Twig to better in
 
 
 .. js:function:: style(path, appName=null)
-  
+
   :param string path: path to the CSS file in the **css/** folder in the app. The **.css** extension is automatically added.
   :param string appName: name of the app. If no value is given, the current app will be used.
 
@@ -150,7 +150,7 @@ The App Framework comes with additional template functions for Twig to better in
 
 
 .. js:function:: image_path(path, appName=null)
-  
+
   :param string path: path to an image file in the **img/** folder in the app.
   :param string appName: name of the app. If no value is given, the current app will be used.
 
@@ -167,7 +167,7 @@ The App Framework comes with additional template functions for Twig to better in
 
 
 .. js:function:: link_to(path, appName=null)
-  
+
   :param string path: path to a file
   :param string appName: name of the app. If no value is given, the current app will be used.
 
diff --git a/developer_manual/app/appframework/unittesting.rst b/developer_manual/app/appframework/unittesting.rst
index ca5a873f8..f96e09e1d 100644
--- a/developer_manual/app/appframework/unittesting.rst
+++ b/developer_manual/app/appframework/unittesting.rst
@@ -29,7 +29,7 @@ A simple test for a controller would look like this:
 .. code-block:: php
 
   <?php
-  namespace OCA\AppTemplateAdvanced;
+  namespace OCA\YourApp;
 
   use OCA\AppFramework\Http\Request;
   use OCA\AppFramework\Db\DoesNotExistException;
@@ -56,11 +56,11 @@ A simple test for a controller would look like this:
             ->with( $this->equalTo('somesetting'),
                 $this->equalTo('this is a test'));
 
-      // we want to return the appname apptemplateadvanced when this method
+      // we want to return the appname yourapp when this method
       // is being called
       $api->expects($this->any())
             ->method('getAppName')
-            ->will($this->returnValue('apptemplateadvanced'));
+            ->will($this->returnValue('yourapp'));
 
       $controller = new ItemController($api, $request, null);
       $response = $controller->setAppValue(null);
@@ -87,7 +87,7 @@ TDD can also be used if the :doc:`angularsetup` is performed and grunt is used.
 
 Classloader
 ~~~~~~~~~~~
-The Advanced Apptemplate provides an extra classloader :file:`tests/classloader.php` that loads the the classes. Require this file at the top of your tests.
+The generated app has an extra classloader :file:`tests/classloader.php` that loads the the classes. Require this file at the top of your tests.
 
 .. note:: The classloader in the **tests/** directory assumes that the **appframework/** folder is in the same directory as the your app. If you run your app in a different apps folder, you will need to link the App Framework into the same folder where your app folder resides.
 
@@ -110,7 +110,7 @@ To run the tests once use::
 
 A JUnit compatible result file will be generated for the continous integration server.
 
-Like stated in :doc:`angularsetup` tests go into the folder **js/tests/**. The default setup uses `Jasmine <http://pivotal.github.com/jasmine/>`_ but also other test frameworks like `Mocha <http://visionmedia.github.com/mocha/>`_ or `QUnit <http://qunitjs.com/>`_ can be used but `have to be configured first <http://testacular.github.com/0.6.0/config/files.html>`_. 
+Like stated in :doc:`angularsetup` tests go into the folder **js/tests/**. The default setup uses `Jasmine <http://pivotal.github.com/jasmine/>`_ but also other test frameworks like `Mocha <http://visionmedia.github.com/mocha/>`_ or `QUnit <http://qunitjs.com/>`_ can be used but `have to be configured first <http://testacular.github.com/0.6.0/config/files.html>`_.
 
 AngularJS
 ~~~~~~~~~