diff --git a/application/controllers/crm/Statusgrund.php b/application/controllers/crm/Statusgrund.php
index 7a399b4aa..ade052252 100644
--- a/application/controllers/crm/Statusgrund.php
+++ b/application/controllers/crm/Statusgrund.php
@@ -11,12 +11,12 @@ class Statusgrund extends FHC_Controller
 				'index' => 'basis/status:r',
 				'listStatus' => 'basis/status:r',
 				'listGrund' => 'basis/status:r',
-				'editGrund' => 'basis/status:w',
-				'editStatus' => 'basis/status:w',
-				'newGrund' => 'basis/status:w',
-				'saveGrund' => 'basis/status:w',
-				'insGrund' => 'basis/status:w',
-				'saveStatus' => 'basis/status:w'
+				'editGrund' => 'basis/status:rw',
+				'editStatus' => 'basis/status:rw',
+				'newGrund' => 'basis/status:rw',
+				'saveGrund' => 'basis/status:rw',
+				'insGrund' => 'basis/status:rw',
+				'saveStatus' => 'basis/status:rw'
 			)
 		);
 
diff --git a/application/controllers/organisation/Studienjahr.php b/application/controllers/organisation/Studienjahr.php
index 899271960..7d5d752cb 100644
--- a/application/controllers/organisation/Studienjahr.php
+++ b/application/controllers/organisation/Studienjahr.php
@@ -17,11 +17,11 @@ class Studienjahr extends FHC_Controller
 		parent::__construct(
 			array(
 				'listStudienjahr' => 'basis/studiensemester:r',
-				'editStudienjahr' => 'basis/studiensemester:w',
-				'newStudienjahr' => 'basis/studiensemester:w',
-				'insStudienjahr' => 'basis/studiensemester:w',
-				'saveStudienjahr' => 'basis/studiensemester:w',
-				'deleteStudienjahr' => 'basis/studiensemester:w'
+				'editStudienjahr' => 'basis/studiensemester:rw',
+				'newStudienjahr' => 'basis/studiensemester:rw',
+				'insStudienjahr' => 'basis/studiensemester:rw',
+				'saveStudienjahr' => 'basis/studiensemester:rw',
+				'deleteStudienjahr' => 'basis/studiensemester:rw'
 			)
 		);
 
diff --git a/application/controllers/organisation/Studiensemester.php b/application/controllers/organisation/Studiensemester.php
index 0021a6d9b..8d8eeae64 100644
--- a/application/controllers/organisation/Studiensemester.php
+++ b/application/controllers/organisation/Studiensemester.php
@@ -17,11 +17,11 @@ class Studiensemester extends FHC_Controller
 		parent::__construct(
 			array(
 				'listStudiensemester' => 'basis/studiensemester:r',
-				'editStudiensemester' => 'basis/studiensemester:w',
-				'newStudiensemester' => 'basis/studiensemester:w',
-				'insStudiensemester' => 'basis/studiensemester:w',
-				'saveStudiensemester' => 'basis/studiensemester:w',
-				'deleteStudiensemester' => 'basis/studiensemester:w'
+				'editStudiensemester' => 'basis/studiensemester:rw',
+				'newStudiensemester' => 'basis/studiensemester:rw',
+				'insStudiensemester' => 'basis/studiensemester:rw',
+				'saveStudiensemester' => 'basis/studiensemester:rw',
+				'deleteStudiensemester' => 'basis/studiensemester:rw'
 			)
 		);
 
diff --git a/application/controllers/system/Messages.php b/application/controllers/system/Messages.php
index 11f7e5a2f..8af20368c 100644
--- a/application/controllers/system/Messages.php
+++ b/application/controllers/system/Messages.php
@@ -13,8 +13,8 @@ class Messages extends FHC_Controller
 	{
 		parent::__construct(
 			array(
-				'write' => array('basis/message:w', 'infocenter:w'),
-				'send' => array('basis/message:w', 'infocenter:w'),
+				'write' => array('basis/message:rw', 'infocenter:rw'),
+				'send' => array('basis/message:rw', 'infocenter:rw'),
 				'getVorlage' => array('basis/message:r', 'infocenter:r'),
 				'parseMessageText' => array('basis/message:r', 'infocenter:r'),
 				'getMessageFromIds' => array('basis/message:r', 'infocenter:r')
diff --git a/application/controllers/system/Phrases.php b/application/controllers/system/Phrases.php
index e4262ae3d..1dfbcab52 100644
--- a/application/controllers/system/Phrases.php
+++ b/application/controllers/system/Phrases.php
@@ -11,13 +11,13 @@ class Phrases extends FHC_Controller
 				'index' => 'system/phrase:r',
 				'table' => 'system/phrase:r',
 				'view' => 'system/phrase:r',
-				'deltext' => 'system/phrase:w',
-				'edit' => 'system/phrase:w',
-				'write' => 'system/phrase:w',
-				'save' => 'system/phrase:w',
-				'newText' => 'system/phrase:w',
-				'editText' => 'system/phrase:w',
-				'saveText' => 'system/phrase:w'
+				'deltext' => 'system/phrase:rw',
+				'edit' => 'system/phrase:rw',
+				'write' => 'system/phrase:rw',
+				'save' => 'system/phrase:rw',
+				'newText' => 'system/phrase:rw',
+				'editText' => 'system/phrase:rw',
+				'saveText' => 'system/phrase:rw'
 			)
 		);
 
diff --git a/application/controllers/system/UDF.php b/application/controllers/system/UDF.php
index c86c00505..304ca166b 100644
--- a/application/controllers/system/UDF.php
+++ b/application/controllers/system/UDF.php
@@ -9,7 +9,7 @@ class UDF extends FHC_Controller
         parent::__construct(
 			array(
 				'index' => 'basis/person:r',
-				'saveUDF' => 'basis/person:w'
+				'saveUDF' => 'basis/person:rw'
 			)
 		);
 
diff --git a/application/controllers/system/Vorlage.php b/application/controllers/system/Vorlage.php
index a25d8c3bc..9e53474df 100644
--- a/application/controllers/system/Vorlage.php
+++ b/application/controllers/system/Vorlage.php
@@ -11,16 +11,16 @@ class Vorlage extends FHC_Controller
 				'index' => 'system/vorlage:r',
 				'table' => 'system/vorlage:r',
 				'view' => 'system/vorlage:r',
-				'edit' => 'system/vorlage:w',
-				'write' => 'system/vorlage:w',
-				'save' => 'system/vorlage:w',
-				'newText' => 'system/vorlage:w',
-				'editText' => 'system/vorlage:w',
-				'newText' => 'system/vorlage:w',
+				'edit' => 'system/vorlage:rw',
+				'write' => 'system/vorlage:rw',
+				'save' => 'system/vorlage:rw',
+				'newText' => 'system/vorlage:rw',
+				'editText' => 'system/vorlage:rw',
+				'newText' => 'system/vorlage:rw',
 				'linkDocuments' => 'system/vorlage:r',
-				'saveDocuments' => 'system/vorlage:w',
-				'deleteDocumentLink' => 'system/vorlage:w',
-				'saveText' => 'system/vorlage:w',
+				'saveDocuments' => 'system/vorlage:rw',
+				'deleteDocumentLink' => 'system/vorlage:rw',
+				'saveText' => 'system/vorlage:rw',
 				'preview' => 'system/vorlage:r'
 			)
 		);
diff --git a/application/controllers/system/aufnahme/PrestudentMultiAssign.php b/application/controllers/system/aufnahme/PrestudentMultiAssign.php
index 08a74bb0a..addde4d6a 100644
--- a/application/controllers/system/aufnahme/PrestudentMultiAssign.php
+++ b/application/controllers/system/aufnahme/PrestudentMultiAssign.php
@@ -9,8 +9,8 @@ class PrestudentMultiAssign extends FHC_Controller
         parent::__construct(
 			array(
 				'index' => 'basis/student:r',
-				'linkToStufe' => 'basis/student:w',
-				'linkToAufnahmegruppe' => 'basis/student:w'
+				'linkToStufe' => 'basis/student:rw',
+				'linkToAufnahmegruppe' => 'basis/student:rw'
 			)
 		);
 
diff --git a/application/controllers/system/extensions/Manager.php b/application/controllers/system/extensions/Manager.php
index 9cc076c4b..f13040918 100644
--- a/application/controllers/system/extensions/Manager.php
+++ b/application/controllers/system/extensions/Manager.php
@@ -15,9 +15,9 @@ class Manager extends FHC_Controller
         parent::__construct(
 			array(
 				'index' => 'system/extensions:r',
-				'toggleExtension' => 'system/extensions:w',
-				'delExtension' => 'system/extensions:w',
-				'uploadExtension' => 'system/extensions:w'
+				'toggleExtension' => 'system/extensions:rw',
+				'delExtension' => 'system/extensions:rw',
+				'uploadExtension' => 'system/extensions:rw'
 			)
 		);
 
diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 96f423b7d..c034c8942 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -55,13 +55,13 @@ class InfoCenter extends FHC_Controller
 			array(
 				'index' => 'infocenter:r',
 				'showDetails' => 'infocenter:r',
-				'unlockPerson' => 'infocenter:w',
-				'saveFormalGeprueft' => 'infocenter:w',
+				'unlockPerson' => 'infocenter:rw',
+				'saveFormalGeprueft' => 'infocenter:rw',
 				'getLastPrestudentWithZgvJson' => 'infocenter:r',
-				'saveZgvPruefung' => 'infocenter:w',
-				'saveAbsage' => 'infocenter:w',
-				'saveFreigabe' => 'infocenter:w',
-				'saveNotiz' => 'infocenter:w',
+				'saveZgvPruefung' => 'infocenter:rw',
+				'saveAbsage' => 'infocenter:rw',
+				'saveFreigabe' => 'infocenter:rw',
+				'saveNotiz' => 'infocenter:rw',
 				'reloadNotizen' => 'infocenter:r',
 				'reloadLogs' => 'infocenter:r',
 				'outputAkteContent' => 'infocenter:r'
diff --git a/application/views/system/phrasesinhaltList.php b/application/views/system/phrasesinhaltList.php
index 5938fcc94..f212d440f 100644
--- a/application/views/system/phrasesinhaltList.php
+++ b/application/views/system/phrasesinhaltList.php
@@ -5,7 +5,7 @@
 <div class="row">
   <div class="span4">
 	<h2>Phrase Inhalt - <?php echo $phrase; ?></h2>
-	<form method="post" action="../newtext" target="PhrasesBottom">
+	<form method="post" action="../newText" target="PhrasesBottom">
 	  <input type="hidden" name="phrase_id" value="<?php echo $phrase_id; ?>"/>
 	  <button type="submit">Neu</button>
 	</form>
@@ -24,13 +24,13 @@
 	  </thead>
 	  <tbody>
 		<?php foreach ($phrase_inhalt as $v): ?>
-			<tr><td><a href="../edittext/<?php echo $v->phrasentext_id; ?>" target="PhrasesBottom"><?php echo $v->phrasentext_id; ?></a></td>
+			<tr><td><a href="../editText/<?php echo $v->phrasentext_id; ?>" target="PhrasesBottom"><?php echo $v->phrasentext_id; ?></a></td>
 				<td><?php echo $v->sprache; ?></td>
 				<td><?php echo $v->orgeinheit_kurzbz; ?></td>
 				<td><?php echo $v->orgform_kurzbz; ?></td>
 				<td><?php echo $v->text; ?></td>
 				<td><?php echo $v->description; ?></td>
-				<td><a href="../edittext/<?php echo $v->phrasentext_id; ?>" target="PhrasesBottom">edit</a></td>
+				<td><a href="../editText/<?php echo $v->phrasentext_id; ?>" target="PhrasesBottom">edit</a></td>
 				<td>
 					<a href="javascript:void(0);" onclick="delPhrasentext(<?php echo $v->phrasentext_id; ?>, <?php echo $phrase_id; ?>)">delete</a>
 				</td>
diff --git a/application/views/system/vorlage/templatetextList.php b/application/views/system/vorlage/templatetextList.php
index 7eb2b84e3..8736b36ee 100644
--- a/application/views/system/vorlage/templatetextList.php
+++ b/application/views/system/vorlage/templatetextList.php
@@ -5,7 +5,7 @@
 <div class="row">
   <div class="span4">
 	<h2>Vorlagentext - <?php echo $vorlage_kurzbz; ?></h2>
-	<form method="post" action="../newtext" target="VorlageBottom">
+	<form method="post" action="../newText" target="VorlageBottom">
 	  <input type="hidden" name="vorlage_kurzbz" value="<?php echo $vorlage_kurzbz; ?>"/>
 	  <button type="submit">Neu</button>
 	</form>
@@ -28,8 +28,8 @@
 	  <tbody>
 		<?php foreach ($vorlagentext as $v): ?>
 			<tr>
-				<td><a href="../edittext/<?php echo $v->vorlagestudiengang_id; ?>" target="VorlageBottom"><?php echo $v->vorlagestudiengang_id; ?></a></td>
-				<td><a href="../edittext/<?php echo $v->vorlagestudiengang_id; ?>" target="VorlageBottom"><?php echo $v->vorlage_kurzbz; ?></a></td>
+				<td><a href="../editText/<?php echo $v->vorlagestudiengang_id; ?>" target="VorlageBottom"><?php echo $v->vorlagestudiengang_id; ?></a></td>
+				<td><a href="../editText/<?php echo $v->vorlagestudiengang_id; ?>" target="VorlageBottom"><?php echo $v->vorlage_kurzbz; ?></a></td>
 				<td><?php echo $v->version; ?></td>
 				<td><?php echo $v->oe_kurzbz; ?></td>
 				<td></td>