diff --git a/api.php b/api.php
index cdf29f9..d0a48d6 100644
--- a/api.php
+++ b/api.php
@@ -1,9 +1,9 @@
 <?php
 require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'go-trainer/autoload.inc';                                         //Project Classes
+require_once 'go_trainer/autoload.inc';                                         //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
 
-echo \SYSTEM\API\api::run('\SYSTEM\API\verify','api_demo_basic',array_merge($_POST,$_GET));
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify','api_go_trainer',array_merge($_POST,$_GET));
 new \SYSTEM\LOG\COUNTER("API was called sucessfully.");
\ No newline at end of file
diff --git a/config.dist b/config.dist
index 75b9e32..b708741 100644
--- a/config.dist
+++ b/config.dist
@@ -2,7 +2,7 @@
 namespace WEBCRAFT;
 function basic_config(){
     return array(   array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTING,        E_ALL | E_STRICT),
-                    array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL,          'http://www.mojotrollz.eu/web/test/go-trainer/'),
+                    array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL,          'http://www.mojotrollz.eu/web/test/go_trainer/'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH,         '/server/path/to/project/'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE,               \SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_HOST,               '127.0.0.1'),
@@ -10,9 +10,9 @@ function basic_config(){
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_USER,               'host'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD,           'db_pw'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME,             'db_name'),
-                    array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT,           'go-trainer'),
+                    array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_PROJECT,           'go_trainer'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL,    'lib/system/'),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS,                 array('deDE','enUS')),
                     array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG,          'deDE'),
-                    array(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH,         '/server/üath/to/projectlogextraction/'));
+                    array(\SYSTEM\CONFIG\config_ids::SYS_CRON_LOG2SQLITE_PATH,         '/server/path/to/go_trainer/'));
 }
\ No newline at end of file
diff --git a/go-trainer/api/api_go_trainer.php b/go_trainer/api/api_go_trainer.php
similarity index 100%
rename from go-trainer/api/api_go_trainer.php
rename to go_trainer/api/api_go_trainer.php
diff --git a/go-trainer/api/autoload.inc b/go_trainer/api/autoload.inc
similarity index 100%
rename from go-trainer/api/autoload.inc
rename to go_trainer/api/autoload.inc
diff --git a/go-trainer/autoload.inc b/go_trainer/autoload.inc
similarity index 100%
rename from go-trainer/autoload.inc
rename to go_trainer/autoload.inc
diff --git a/go-trainer/cron/autoload.inc b/go_trainer/cron/autoload.inc
similarity index 100%
rename from go-trainer/cron/autoload.inc
rename to go_trainer/cron/autoload.inc
diff --git a/go-trainer/files/autoload.inc b/go_trainer/files/autoload.inc
similarity index 100%
rename from go-trainer/files/autoload.inc
rename to go_trainer/files/autoload.inc
diff --git a/go-trainer/page/autoload.inc b/go_trainer/page/autoload.inc
similarity index 100%
rename from go-trainer/page/autoload.inc
rename to go_trainer/page/autoload.inc
diff --git a/go-trainer/page/default_about/css/default_about.css b/go_trainer/page/default_about/css/default_about.css
similarity index 100%
rename from go-trainer/page/default_about/css/default_about.css
rename to go_trainer/page/default_about/css/default_about.css
diff --git a/go-trainer/page/default_about/default_about.php b/go_trainer/page/default_about/default_about.php
similarity index 100%
rename from go-trainer/page/default_about/default_about.php
rename to go_trainer/page/default_about/default_about.php
diff --git a/go-trainer/page/default_about/js/default_about.js b/go_trainer/page/default_about/js/default_about.js
similarity index 100%
rename from go-trainer/page/default_about/js/default_about.js
rename to go_trainer/page/default_about/js/default_about.js
diff --git a/go-trainer/page/default_about/tpl/default_about.tpl b/go_trainer/page/default_about/tpl/default_about.tpl
similarity index 100%
rename from go-trainer/page/default_about/tpl/default_about.tpl
rename to go_trainer/page/default_about/tpl/default_about.tpl
diff --git a/go-trainer/page/default_impressum/default_impressum.php b/go_trainer/page/default_impressum/default_impressum.php
similarity index 100%
rename from go-trainer/page/default_impressum/default_impressum.php
rename to go_trainer/page/default_impressum/default_impressum.php
diff --git a/go-trainer/page/default_impressum/js/default_impressum.js b/go_trainer/page/default_impressum/js/default_impressum.js
similarity index 100%
rename from go-trainer/page/default_impressum/js/default_impressum.js
rename to go_trainer/page/default_impressum/js/default_impressum.js
diff --git a/go-trainer/page/default_impressum/tpl/impressum.tpl b/go_trainer/page/default_impressum/tpl/impressum.tpl
similarity index 100%
rename from go-trainer/page/default_impressum/tpl/impressum.tpl
rename to go_trainer/page/default_impressum/tpl/impressum.tpl
diff --git a/go-trainer/page/default_page/css/default_page.css b/go_trainer/page/default_page/css/default_page.css
similarity index 100%
rename from go-trainer/page/default_page/css/default_page.css
rename to go_trainer/page/default_page/css/default_page.css
diff --git a/go-trainer/page/default_page/default_page.php b/go_trainer/page/default_page/default_page.php
similarity index 100%
rename from go-trainer/page/default_page/default_page.php
rename to go_trainer/page/default_page/default_page.php
diff --git a/go-trainer/page/default_page/js/default_page.js b/go_trainer/page/default_page/js/default_page.js
similarity index 100%
rename from go-trainer/page/default_page/js/default_page.js
rename to go_trainer/page/default_page/js/default_page.js
diff --git a/go-trainer/page/default_page/tpl/default_page.tpl b/go_trainer/page/default_page/tpl/default_page.tpl
similarity index 100%
rename from go-trainer/page/default_page/tpl/default_page.tpl
rename to go_trainer/page/default_page/tpl/default_page.tpl
diff --git a/go-trainer/page/default_page/tpl/menu.tpl b/go_trainer/page/default_page/tpl/menu.tpl
similarity index 100%
rename from go-trainer/page/default_page/tpl/menu.tpl
rename to go_trainer/page/default_page/tpl/menu.tpl
diff --git a/go-trainer/page/default_start/css/default_start.css b/go_trainer/page/default_start/css/default_start.css
similarity index 100%
rename from go-trainer/page/default_start/css/default_start.css
rename to go_trainer/page/default_start/css/default_start.css
diff --git a/go-trainer/page/default_start/default_start.php b/go_trainer/page/default_start/default_start.php
similarity index 100%
rename from go-trainer/page/default_start/default_start.php
rename to go_trainer/page/default_start/default_start.php
diff --git a/go-trainer/page/default_start/js/default_start.js b/go_trainer/page/default_start/js/default_start.js
similarity index 100%
rename from go-trainer/page/default_start/js/default_start.js
rename to go_trainer/page/default_start/js/default_start.js
diff --git a/go-trainer/page/default_start/tpl/default_start.tpl b/go_trainer/page/default_start/tpl/default_start.tpl
similarity index 100%
rename from go-trainer/page/default_start/tpl/default_start.tpl
rename to go_trainer/page/default_start/tpl/default_start.tpl
diff --git a/go-trainer/page/default_start/tpl/text.tpl b/go_trainer/page/default_start/tpl/text.tpl
similarity index 100%
rename from go-trainer/page/default_start/tpl/text.tpl
rename to go_trainer/page/default_start/tpl/text.tpl
diff --git a/go-trainer/page/page_demo_basic.php b/go_trainer/page/page_go_trainer.php
similarity index 91%
rename from go-trainer/page/page_demo_basic.php
rename to go_trainer/page/page_go_trainer.php
index d2cafe8..dde6db4 100644
--- a/go-trainer/page/page_demo_basic.php
+++ b/go_trainer/page/page_go_trainer.php
@@ -1,5 +1,5 @@
 <?php
-class page_demo_basic extends \SYSTEM\API\api_default {
+class page_go_trainer extends \SYSTEM\API\api_default {
     public static function get_apigroup(){
         return 1;}
     public static function get_class($params = null){
diff --git a/go-trainer/path/PLIB.php b/go_trainer/path/PLIB.php
similarity index 100%
rename from go-trainer/path/PLIB.php
rename to go_trainer/path/PLIB.php
diff --git a/go-trainer/path/PPAGE.php b/go_trainer/path/PPAGE.php
similarity index 63%
rename from go-trainer/path/PPAGE.php
rename to go_trainer/path/PPAGE.php
index 8ad1458..d0b99c9 100644
--- a/go-trainer/path/PPAGE.php
+++ b/go_trainer/path/PPAGE.php
@@ -1,5 +1,5 @@
 <?php
 class PPAGE extends \SYSTEM\PATH {
     public function __construct($subpath = '') {
-        parent::__construct(new \SYSTEM\PROOT(), 'go-trainer/page/', $subpath);}
+        parent::__construct(new \SYSTEM\PROOT(), 'go_trainer/page/', $subpath);}
 }
diff --git a/go-trainer/path/PSAI.php b/go_trainer/path/PSAI.php
similarity index 62%
rename from go-trainer/path/PSAI.php
rename to go_trainer/path/PSAI.php
index 4b75eec..7ceb50c 100644
--- a/go-trainer/path/PSAI.php
+++ b/go_trainer/path/PSAI.php
@@ -1,5 +1,5 @@
 <?php
 class PSAI extends \SYSTEM\PATH {
     public function __construct($subpath = '') {
-        parent::__construct(new \SYSTEM\PROOT(), 'go-trainer/sai/', $subpath);}
+        parent::__construct(new \SYSTEM\PROOT(), 'go_trainer/sai/', $subpath);}
 }
diff --git a/go-trainer/path/PSQL.php b/go_trainer/path/PSQL.php
similarity index 62%
rename from go-trainer/path/PSQL.php
rename to go_trainer/path/PSQL.php
index 60af315..dd3eb6c 100644
--- a/go-trainer/path/PSQL.php
+++ b/go_trainer/path/PSQL.php
@@ -1,5 +1,5 @@
 <?php
 class PSQL extends \SYSTEM\PATH {
     public function __construct($subpath = '') {
-        parent::__construct(new \SYSTEM\PROOT(), 'go-trainer/sql/', $subpath);}
+        parent::__construct(new \SYSTEM\PROOT(), 'go_trainer/sql/', $subpath);}
 }
\ No newline at end of file
diff --git a/go-trainer/path/autoload.inc b/go_trainer/path/autoload.inc
similarity index 100%
rename from go-trainer/path/autoload.inc
rename to go_trainer/path/autoload.inc
diff --git a/go-trainer/sai/autoload.inc b/go_trainer/sai/autoload.inc
similarity index 100%
rename from go-trainer/sai/autoload.inc
rename to go_trainer/sai/autoload.inc
diff --git a/go-trainer/sql/DATA_DEMO_BASIC.php b/go_trainer/sql/DATA_DEMO_BASIC.php
similarity index 100%
rename from go-trainer/sql/DATA_DEMO_BASIC.php
rename to go_trainer/sql/DATA_DEMO_BASIC.php
diff --git a/go-trainer/sql/autoload.inc b/go_trainer/sql/autoload.inc
similarity index 100%
rename from go-trainer/sql/autoload.inc
rename to go_trainer/sql/autoload.inc
diff --git a/go-trainer/sql/mysql/system_page.sql b/go_trainer/sql/mysql/system_page.sql
similarity index 100%
rename from go-trainer/sql/mysql/system_page.sql
rename to go_trainer/sql/mysql/system_page.sql
diff --git a/go-trainer/sql/mysql/webcraft_imprint.sql b/go_trainer/sql/mysql/webcraft_imprint.sql
similarity index 100%
rename from go-trainer/sql/mysql/webcraft_imprint.sql
rename to go_trainer/sql/mysql/webcraft_imprint.sql
diff --git a/index.php b/index.php
index 5c27d4b..ff4913d 100644
--- a/index.php
+++ b/index.php
@@ -1,9 +1,9 @@
 <?php
 require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'go-trainer/autoload.inc';                                         //Project Classes
+require_once 'go_trainer/autoload.inc';                                         //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
 
-echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_demo_basic', array_merge($_POST,$_GET), 1, false, true);
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_go_trainer', array_merge($_POST,$_GET), 1, false, true);
 new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");
\ No newline at end of file
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 19c7f47..a1189a6 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,5 +1,15 @@
+auxiliary.org-netbeans-modules-css-prep.less_2e_compiler_2e_options=
+auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false
+auxiliary.org-netbeans-modules-css-prep.less_2e_mappings=/less:/css
+auxiliary.org-netbeans-modules-css-prep.sass_2e_compiler_2e_options=
+auxiliary.org-netbeans-modules-css-prep.sass_2e_enabled=false
+auxiliary.org-netbeans-modules-css-prep.sass_2e_mappings=/scss:/css
 auxiliary.org-netbeans-modules-php-smarty.smarty-framework=true
-include.path=${php.global.include.path}
+browser.reload.on.save=true
+code.analysis.excludes=
+ignore.path=
+include.path=\
+    ${php.global.include.path}
 php.version=PHP_56
 source.encoding=UTF-8
 src.dir=.
diff --git a/nbproject/project.xml b/nbproject/project.xml
index d76bf07..586db32 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.php.project</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>go-trainer</name>
+            <name>go_trainer</name>
         </data>
     </configuration>
 </project>
diff --git a/sai.php b/sai.php
index 4dd4a66..e044135 100644
--- a/sai.php
+++ b/sai.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'go-trainer/autoload.inc';                                         //Project Classes
+require_once 'go_trainer/autoload.inc';                                         //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));
diff --git a/setup.php b/setup.php
index b6a3bd9..a9c1663 100644
--- a/setup.php
+++ b/setup.php
@@ -1,6 +1,6 @@
 <?php
 require_once 'lib/autoload.inc';                                                //SYSTEM Classes
-require_once 'go-trainer/autoload.inc';                                         //Project Classes
+require_once 'go_trainer/autoload.inc';                                         //Project Classes
 require_once '/home/web/web/config/get_config.php';
 
 \SYSTEM\system::start(\WEBCRAFT\get_config(dirname(__FILE__)));