diff --git a/Classes/Frontend/FormBase.php b/Classes/Frontend/FormBase.php
index 37fe83b..eabe240 100644
--- a/Classes/Frontend/FormBase.php
+++ b/Classes/Frontend/FormBase.php
@@ -424,7 +424,7 @@ protected function getPrefillUid(RequestInterface $request)
     /**
      * Returns configurations instance for current request.
      *
-     * @return \Sys25\RnBase\Configuration\ConfigurationInterface
+     * @return ConfigurationInterface
      */
     protected function getConfigurations()
     {
diff --git a/Classes/Frontend/FormView.php b/Classes/Frontend/FormView.php
index 5c1df56..5dcbb4f 100644
--- a/Classes/Frontend/FormView.php
+++ b/Classes/Frontend/FormView.php
@@ -39,7 +39,7 @@ class FormView extends BaseView
     /**
      * {@inheritdoc}
      *
-     * @see \Sys25\RnBase\Frontend\View\Marker\BaseView::createOutput()
+     * @see BaseView::createOutput()
      *
      * @codingStandardsIgnoreStart (interface/abstract mistake)
      */
diff --git a/action/class.tx_mkforms_action_FormBase.php b/action/class.tx_mkforms_action_FormBase.php
index c3205cb..bfa9d92 100644
--- a/action/class.tx_mkforms_action_FormBase.php
+++ b/action/class.tx_mkforms_action_FormBase.php
@@ -70,7 +70,7 @@ class tx_mkforms_action_FormBase extends \Sys25\RnBase\Frontend\Controller\Abstr
     protected $errors = [];
 
     /**
-     * @var \Sys25\RnBase\Frontend\Request\RequestInterface
+     * @var Sys25\RnBase\Frontend\Request\RequestInterface
      */
     protected $request;
 
@@ -120,7 +120,7 @@ public function handleRequest(Sys25\RnBase\Frontend\Request\RequestInterface $re
     /**
      * Gibt den Pfad zum XML zurück.
      *
-     * @param \Sys25\RnBase\Configuration\Processor $configurations
+     * @param Sys25\RnBase\Configuration\Processor $configurations
      * @param string                   $confId
      *
      * @return string
@@ -133,7 +133,7 @@ protected function getXmlPath(&$configurations, $confId)
     /**
      * Wir prüfen die Konfiguration.
      *
-     * @param \Sys25\RnBase\Configuration\Processor $configurations
+     * @param Sys25\RnBase\Configuration\Processor $configurations
      * @param string                   $confId
      *
      * @return array
diff --git a/api/class.templatemethods.php b/api/class.templatemethods.php
index ae00810..ccfeac8 100644
--- a/api/class.templatemethods.php
+++ b/api/class.templatemethods.php
@@ -5,7 +5,7 @@ class formidable_templatemethods extends formidable_mainscriptingmethods
     private static $cache;
 
     /**
-     * @return \Sys25\RnBase\Cache\CacheInterface
+     * @return Sys25\RnBase\Cache\CacheInterface
      */
     private function getCache()
     {
diff --git a/api/class.tx_ameosformidable.php b/api/class.tx_ameosformidable.php
index 4b800cb..11c7f6d 100644
--- a/api/class.tx_ameosformidable.php
+++ b/api/class.tx_ameosformidable.php
@@ -277,7 +277,7 @@ public function getCObj()
     /**
      * Return the typoscript configurations object.
      *
-     * @return \Sys25\RnBase\Configuration\Processor
+     * @return Sys25\RnBase\Configuration\Processor
      */
     public function getConfigurations()
     {
@@ -309,7 +309,7 @@ public function getConfTS($confid)
     /**
      * Set TS-Configuration. This is either the given instance or a new instance based on config.tx_mkforms.
      *
-     * @param \Sys25\RnBase\Configuration\Processor $config
+     * @param Sys25\RnBase\Configuration\Processor $config
      * @param string                   $confid
      */
     public function setConfigurations($config, $confid)
@@ -363,7 +363,7 @@ public function setConfigurations($config, $confid)
      * @param                          object          Parent extension using FORMidable
      * @param                          mixed           Absolute path to the XML configuration file
      * @param int                      $iForcedEntryId :
-     * @param \Sys25\RnBase\Configuration\Processor $configurations TS-Configuration
+     * @param Sys25\RnBase\Configuration\Processor $configurations TS-Configuration
      * @param string                   $confid         ;
      */
     public function init(&$oParent, $mXml, $iForcedEntryId = false, $configurations = false, $confid = '')
@@ -1587,7 +1587,7 @@ public function _filterUnProcessed()
      * @param object                        $oParent        ref to parent object (usually plugin)
      * @param array                         $aConf          typoscript array
      * @param int|bool                      $iForcedEntryId UID to edit (if any)
-     * @param \Sys25\RnBase\Configuration\Processor|bool $configurations
+     * @param Sys25\RnBase\Configuration\Processor|bool $configurations
      * @param string                        $confid
      */
     public function initFromTs($oParent, array $aConf, $iForcedEntryId = false, $configurations = false, $confid = '')
diff --git a/dh/mail/class.tx_mkforms_dh_mail_Main.php b/dh/mail/class.tx_mkforms_dh_mail_Main.php
index d39983f..c6fc0b1 100644
--- a/dh/mail/class.tx_mkforms_dh_mail_Main.php
+++ b/dh/mail/class.tx_mkforms_dh_mail_Main.php
@@ -123,7 +123,7 @@ private function findEngine()
      *
      * @param array $record
      *
-     * @return \Sys25\RnBase\Domain\Model\BaseModel
+     * @return Sys25\RnBase\Domain\Model\BaseModel
      */
     private function getDataModel(array $record)
     {
@@ -293,7 +293,7 @@ private function buildTemplateObject()
     /**
      * Sends a mail via mkmailer.
      *
-     * @param \Sys25\RnBase\Domain\Model\DataInterface $model
+     * @param Sys25\RnBase\Domain\Model\DataInterface $model
      */
     protected function sendMkmailer(
         Sys25\RnBase\Domain\Model\DataInterface $model
@@ -365,7 +365,7 @@ protected function sendMkmailer(
      * Parses the content of the mail.
      *
      * @param object                               $content With setter for subject contenttext, contenthtml
-     * @param \Sys25\RnBase\Domain\Model\DataInterface $model
+     * @param Sys25\RnBase\Domain\Model\DataInterface $model
      */
     protected function parseMail(
         $content,
@@ -398,7 +398,7 @@ protected function parseMail(
      * Parses the data into the content.
      *
      * @param string                               $content
-     * @param \Sys25\RnBase\Domain\Model\DataInterface $model
+     * @param Sys25\RnBase\Domain\Model\DataInterface $model
      * @param string                               $fieldId
      *
      * @return string
diff --git a/ds/db/class.tx_mkforms_ds_db_Main.php b/ds/db/class.tx_mkforms_ds_db_Main.php
index 7f20ac3..ef58f02 100644
--- a/ds/db/class.tx_mkforms_ds_db_Main.php
+++ b/ds/db/class.tx_mkforms_ds_db_Main.php
@@ -8,7 +8,7 @@
 class tx_mkforms_ds_db_Main extends formidable_maindatasource
 {
     /**
-     * @var \Sys25\RnBase\Database\Connection
+     * @var Sys25\RnBase\Database\Connection
      */
     public $oDb = false;
 
diff --git a/forms/class.tx_mkforms_forms_IForm.php b/forms/class.tx_mkforms_forms_IForm.php
index 9ebaefd..2e69d80 100644
--- a/forms/class.tx_mkforms_forms_IForm.php
+++ b/forms/class.tx_mkforms_forms_IForm.php
@@ -31,7 +31,7 @@ interface tx_mkforms_forms_IForm
      * @param                          object          Parent extension using FORMidable
      * @param                          mixed           Absolute path to the XML configuration file
      * @param int                      $iForcedEntryId :
-     * @param \Sys25\RnBase\Configuration\Processor $configurations TS-Configuration
+     * @param Sys25\RnBase\Configuration\Processor $configurations TS-Configuration
      * @param string                   $confid         ;
      */
     public function init(&$oParent, $mXml, $iForcedEntryId = false, $configurations = false, $confid = '');
@@ -41,7 +41,7 @@ public function getFormId();
     /**
      * Return the typoscript configurations object.
      *
-     * @return \Sys25\RnBase\Configuration\Processor
+     * @return Sys25\RnBase\Configuration\Processor
      */
     public function getConfigurations();
 
diff --git a/js/class.tx_mkforms_js_Loader.php b/js/class.tx_mkforms_js_Loader.php
index 05abd1f..63a6326 100644
--- a/js/class.tx_mkforms_js_Loader.php
+++ b/js/class.tx_mkforms_js_Loader.php
@@ -144,7 +144,7 @@ public function includeCodeBehind()
      */
     public function addCodeBehind($ref, $sFilePath)
     {
-        $serverPath = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($sFilePath);
+        $serverPath = GeneralUtility::getFileAbsFileName($sFilePath);
         $path = \TYPO3\CMS\Core\Utility\PathUtility::getAbsoluteWebPath($serverPath);
         $this->aCodeBehindJsIncludes[$ref] = '<script src="'.
             $this->getForm()->getJSLoader()->getScriptPath($path).'"></script>';
@@ -504,7 +504,7 @@ private function getJSFramework()
         if (!$this->jsWrapper) {
             $wrapperClass = $this->getForm()->getConfTS('jslib');
             $wrapperClass = $wrapperClass ? $wrapperClass : 'tx_mkforms_js_DefaultFramework';
-            $this->jsWrapper = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
+            $this->jsWrapper = GeneralUtility::makeInstance(
                 $wrapperClass,
                 $this->getForm()->getConfigurations(),
                 $this->getForm()->getConfId().'jsframework.'
@@ -599,7 +599,7 @@ public function additionalHeaderData($sData, $sKey = false, $bFirstPos = false,
         if ($sKey && !array_key_exists($sKey, $this->headerKeys)) {
             $this->headerKeys[$sKey] = 1;
         }
-        if (\Sys25\RnBase\Utility\Environment::isFrontend()) {
+        if (Environment::isFrontend()) {
             if ($this->mayUseStandardHeaderInjection()) {
                 $aHeaders = &$GLOBALS['TSFE']->additionalHeaderData;
             } else {
diff --git a/util/class.tx_mkforms_util_FormBase.php b/util/class.tx_mkforms_util_FormBase.php
index b10e9ef..8dc9e73 100644
--- a/util/class.tx_mkforms_util_FormBase.php
+++ b/util/class.tx_mkforms_util_FormBase.php
@@ -157,9 +157,9 @@ public static function flattenArray($data, $aWidgetNames = false)
      * Liefert das Konfigurations-Objekt.
      *
      * @param tx_ameosformidable       $form
-     * @param \Sys25\RnBase\Configuration\Processor $configurations
+     * @param Sys25\RnBase\Configuration\Processor $configurations
      *
-     * @return \Sys25\RnBase\Configuration\Processor
+     * @return Sys25\RnBase\Configuration\Processor
      */
     protected static function getConfigurations(tx_ameosformidable $form, Sys25\RnBase\Configuration\Processor $configurations = null)
     {
@@ -192,7 +192,7 @@ protected static function getConfId(tx_ameosformidable &$form, &$confId = '')
     }
 
     /**
-     * @param \Sys25\RnBase\Configuration\Processor $configurations
+     * @param Sys25\RnBase\Configuration\Processor $configurations
      * @param string                   $confId
      *
      * @return string
@@ -210,7 +210,7 @@ protected static function getFieldSeparator(Sys25\RnBase\Configuration\Processor
      *
      * @param array                    $data
      * @param tx_ameosformidable       $form
-     * @param \Sys25\RnBase\Configuration\Processor $configurations
+     * @param Sys25\RnBase\Configuration\Processor $configurations
      * @param string                   $confId
      *
      * @return array
diff --git a/util/class.tx_mkforms_util_FormFill.php b/util/class.tx_mkforms_util_FormFill.php
index d7dc814..053a0da 100644
--- a/util/class.tx_mkforms_util_FormFill.php
+++ b/util/class.tx_mkforms_util_FormFill.php
@@ -42,7 +42,7 @@ class tx_mkforms_util_FormFill
      * * 'dependsOn':       Optional:   Array of options for dependent fields: array('formfieldname' => form fields which's value is used, 'dbfield' => dedicated database field, 'dbtable'(optional) => real name of the table of the dedicated database field (needed for complex searches with JOINs; otherwise $params['table'] is used.)). Note that either used table needs to be defined in $TCA!
      * * 'debug':           Optional:   Flag whether SQL query is executed in debug mode
      *
-     * @see \Sys25\RnBase\Database\Connection::getInstance()->doSelect
+     * @see Sys25\RnBase\Database\Connection::getInstance()->doSelect
      *
      * Complete example:
      *  <params>
diff --git a/util/class.tx_mkforms_util_Loader.php b/util/class.tx_mkforms_util_Loader.php
index 0fd5867..034d1a7 100644
--- a/util/class.tx_mkforms_util_Loader.php
+++ b/util/class.tx_mkforms_util_Loader.php
@@ -180,7 +180,7 @@ public static function loadRunningObjects(array &$aRObjects)
      *
      * @return object instance of the class or false if it fails
      *
-     * @see         \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance
+     * @see         TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance
      * @see         load()
      */
     public function makeInstance($sClass, $sPath = false)
diff --git a/util/class.tx_mkforms_util_XMLParser.php b/util/class.tx_mkforms_util_XMLParser.php
index 5f69b2b..9814717 100644
--- a/util/class.tx_mkforms_util_XMLParser.php
+++ b/util/class.tx_mkforms_util_XMLParser.php
@@ -143,8 +143,8 @@ public static function getXml($sPath, $isSubXml = false, $bPlain = false)
             }
 
             if (self::$useCache) {
-                if (!@is_dir(\Sys25\RnBase\Utility\Environment::getPublicPath().'typo3temp/'.$sCacheDir)) {
-                    GeneralUtility::mkdir_deep(\Sys25\RnBase\Utility\Environment::getPublicPath().'typo3temp/'.$sCacheDir);
+                if (!@is_dir(Environment::getPublicPath().'typo3temp/'.$sCacheDir)) {
+                    GeneralUtility::mkdir_deep(Environment::getPublicPath().'typo3temp/'.$sCacheDir);
                 }
                 tx_mkforms_util_Div::fileWriteBin(
                     $sCachePath,
diff --git a/view/class.tx_mkforms_view_Form.php b/view/class.tx_mkforms_view_Form.php
index 5215fce..2703f92 100644
--- a/view/class.tx_mkforms_view_Form.php
+++ b/view/class.tx_mkforms_view_Form.php
@@ -30,7 +30,7 @@
 class tx_mkforms_view_Form extends \Sys25\RnBase\Frontend\View\Marker\BaseView
 {
     /**
-     * @var \Sys25\RnBase\Frontend\Request\RequestInterface
+     * @var Sys25\RnBase\Frontend\Request\RequestInterface
      */
     protected $request;
 
@@ -46,7 +46,7 @@ public function render($view, Sys25\RnBase\Frontend\Request\RequestInterface $re
      *
      * @param string                     $template
      * @param RequestInterface           $configurations
-     * @param \tx_rnbase_util_FormatUtil $formatter
+     * @param tx_rnbase_util_FormatUtil $formatter
      *
      * @return mixed Ready rendered output or HTTP redirect
      */
@@ -157,7 +157,7 @@ protected function createOutput($template, Sys25\RnBase\Frontend\Request\Request
      * @param array                     $markerArray
      * @param array                     $subpartArray
      * @param array                     $wrappedSubpartArray
-     * @param \Sys25\RnBase\Frontend\Marker\FormatUtil $formatter
+     * @param Sys25\RnBase\Frontend\Marker\FormatUtil $formatter
      * @param string                    $template
      *
      * @return string
@@ -204,7 +204,7 @@ protected function addAdditionalMarkers(
      * in einem eigenen View überschrieben werden.
      *
      * @param ArrayObject              $viewData
-     * @param \Sys25\RnBase\Configuration\Processor $configurations
+     * @param Sys25\RnBase\Configuration\Processor $configurations
      */
     protected function handleRedirect()
     {
@@ -233,7 +233,7 @@ protected function handleRedirect()
      * Erzeugt den Link für den Redirect. Kind-Klassen haben die Möglchkeit diese Methode zu überschreiben.
      *
      * @param ArrayObject              $viewData
-     * @param \Sys25\RnBase\Configuration\Processor $configurations
+     * @param Sys25\RnBase\Configuration\Processor $configurations
      * @param string                   $confId
      */
     // @codingStandardsIgnoreStart (interface/abstract mistake)
diff --git a/widgets/fluidviewhelper/class.tx_mkforms_widgets_fluidviewhelper_Main.php b/widgets/fluidviewhelper/class.tx_mkforms_widgets_fluidviewhelper_Main.php
index d35512a..3809ac2 100644
--- a/widgets/fluidviewhelper/class.tx_mkforms_widgets_fluidviewhelper_Main.php
+++ b/widgets/fluidviewhelper/class.tx_mkforms_widgets_fluidviewhelper_Main.php
@@ -32,7 +32,7 @@
 class tx_mkforms_widgets_fluidviewhelper_Main extends formidable_mainrenderlet
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Object\ObjectManager
+     * @var TYPO3\CMS\Extbase\Object\ObjectManager
      */
     protected $_objectManager;
     /**
@@ -46,7 +46,7 @@ class tx_mkforms_widgets_fluidviewhelper_Main extends formidable_mainrenderlet
     /**
      * erzeugt den object manager, um die helper zu instanzieren.
      *
-     * @return \TYPO3\CMS\Extbase\Object\ObjectManager
+     * @return TYPO3\CMS\Extbase\Object\ObjectManager
      */
     protected function getObjectManager()
     {
@@ -91,7 +91,7 @@ protected function getViewHelperClass()
     /**
      * creates the view helper.
      *
-     * @return \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
+     * @return TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
      */
     protected function getViewHelper()
     {