diff --git a/api.php b/api.php
index 0495874..9208b95 100644
--- a/api.php
+++ b/api.php
@@ -9,5 +9,4 @@ require_once '../system/log/register_result_shortcut.php';
 require_once 'config.php';
 SYSTEM\system::start($uvote_config);
 
-$api = new \SYSTEM\API\Api (new SYSTEM\verifyclass(), new ApiClass());
-echo $api->CALL(array_merge($_POST,$_GET));
\ No newline at end of file
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify','api_uvote',array_merge($_POST,$_GET));
\ No newline at end of file
diff --git a/index.php b/index.php
index 9fbaff6..ab0d047 100644
--- a/index.php
+++ b/index.php
@@ -9,5 +9,4 @@ require_once '../system/log/register_result_shortcut.php';
 require_once 'config.php';
 SYSTEM\system::start($uvote_config);
 
-$page = new \SYSTEM\PAGE\PageApi(new SYSTEM\verifyclass(), new PageApi());
-echo $page->CALL(array_merge($_POST,$_GET))->html();
\ No newline at end of file
+echo \SYSTEM\API\api::run('\SYSTEM\API\verify','page_uvote',array_merge($_POST,$_GET),1,false,true)->html();
\ No newline at end of file
diff --git a/uVote/api/ApiClass.php b/uVote/api/api_uvote.php
similarity index 82%
rename from uVote/api/ApiClass.php
rename to uVote/api/api_uvote.php
index 5ba6588..40709df 100644
--- a/uVote/api/ApiClass.php
+++ b/uVote/api/api_uvote.php
@@ -1,6 +1,6 @@
 <?php
 
-class ApiClass extends \SYSTEM\API\apiloginclass {
+class api_uvote extends \SYSTEM\API\api_login {
     public static function call_vote_action_vote($poll_ID, $vote) {
         return votes::write_vote($poll_ID, $vote);}
     public static function call_vote_action_barsperusers($poll_ID){
diff --git a/uVote/page/PageApi.php b/uVote/page/page_uvote.php
similarity index 96%
rename from uVote/page/PageApi.php
rename to uVote/page/page_uvote.php
index f64529e..1f73dc6 100644
--- a/uVote/page/PageApi.php
+++ b/uVote/page/page_uvote.php
@@ -1,6 +1,6 @@
 <?php
 
-class PageApi extends \SYSTEM\PAGE\PageClass {
+class page_uvote extends \SYSTEM\API\api_default {
 
     public static function default_page(){
         return new default_page();}