diff --git a/Website/class.user.php b/Website/class.user.php
index c41e3e8..0367175 100644
--- a/Website/class.user.php
+++ b/Website/class.user.php
@@ -27,7 +27,7 @@ class USER
 			//$new_password = password_hash($upass, PASSWORD_DEFAULT); // 3.2.17 ivan changed to cleartext password saving to make it more easy...
 			$new_password = $upass;
 
-			$stmt = $this->conn->prepare("INSERT INTO users(user_name,user_pass)
+			$stmt = $this->conn->prepare("INSERT INTO benutzer(benutzer_name,benutzer_pass)
 		                                               VALUES(:uname, :upass)");
 
 			$stmt->bindparam(":uname", $uname);
@@ -48,15 +48,15 @@ class USER
 	{
 		try
 		{
-			$stmt = $this->conn->prepare("SELECT user_id, user_name, user_pass FROM users WHERE user_name=:uname");
+			$stmt = $this->conn->prepare("SELECT benutzer_id, benutzer_name, benutzer_pass FROM benutzer WHERE benutzer_name=:uname");
 			$stmt->execute(array(':uname'=>$uname));
 			$userRow=$stmt->fetch(PDO::FETCH_ASSOC);
 			if($stmt->rowCount() == 1)
 			{
 				//if(password_verify($upass, $userRow['user_pass'])) // 3.2.17 ivan changed to cleartext password saving to make it more easy...
-				if($upass == $userRow['user_pass'])
+				if($upass == $userRow['benutzer_pass'])
 				{
-					$_SESSION['user_session'] = $userRow['user_id'];
+					$_SESSION['user_session'] = $userRow['benutzer_id'];
 					return true;
 				}
 				else
diff --git a/Website/dbconfig.php b/Website/dbconfig.php
index 4db8df4..90fa5bd 100644
--- a/Website/dbconfig.php
+++ b/Website/dbconfig.php
@@ -1,10 +1,10 @@
 <?php
 class Database
 {
-    private $host = "localhost";
+    private $db_host = "localhost";
     private $db_name = "bsldb";
-    private $username = "WT1CS1usr";
-    private $password = "ibz4life-WT1CS1";
+    private $db_username = "WT1CS1usr";
+    private $db_password = "ibz4life-WT1CS1";
     public $conn;
 
     public function dbConnection()
@@ -13,7 +13,7 @@ class Database
 	    $this->conn = null;
         try
 		{
-            $this->conn = new PDO("mysql:host=" . $this->host . ";dbname=" . $this->db_name, $this->username, $this->password);
+            $this->conn = new PDO("mysql:host=" . $this->db_host . ";dbname=" . $this->db_name, $this->db_username, $this->db_password);
 			$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         }
 		catch(PDOException $exception)
diff --git a/Website/home.php b/Website/home.php
index d076799..72c85ca 100644
--- a/Website/home.php
+++ b/Website/home.php
@@ -7,8 +7,8 @@
 
 	$user_id = $_SESSION['user_session'];
 
-	$stmt = $auth_user->runQuery("SELECT * FROM users WHERE user_id=:user_id");
-	$stmt->execute(array(":user_id"=>$user_id));
+	$stmt = $auth_user->runQuery("SELECT * FROM benutzer WHERE benutzer_id=:user_id");
+	$stmt->execute(array(":user_id"=>$benutzer_id));
 
 	$userRow=$stmt->fetch(PDO::FETCH_ASSOC);
 
diff --git a/Website/profile.php b/Website/profile.php
index f1ed73c..ead8ebf 100644
--- a/Website/profile.php
+++ b/Website/profile.php
@@ -8,8 +8,8 @@
 
 	$user_id = $_SESSION['user_session'];
 
-	$stmt = $auth_user->runQuery("SELECT * FROM users WHERE user_id=:user_id");
-	$stmt->execute(array(":user_id"=>$user_id));
+	$stmt = $auth_user->runQuery("SELECT * FROM benutzer WHERE benutzer_id=:user_id");
+	$stmt->execute(array(":user_id"=>$benutzer_id));
 
 	$userRow=$stmt->fetch(PDO::FETCH_ASSOC);
 
diff --git a/Website/sign-up.php b/Website/sign-up.php
index f410466..4c78420 100644
--- a/Website/sign-up.php
+++ b/Website/sign-up.php
@@ -17,7 +17,7 @@ if(isset($_POST['btn-signup'])){
 				$error[] = "Password must be atleast 6 characters";
 		} else {
 		try {
-				$stmt = $user->runQuery("SELECT user_name FROM users WHERE user_name=:uname");
+				$stmt = $user->runQuery("SELECT benutzer_name FROM benutzer WHERE benutzer_name=:uname");
 				$stmt->execute(array(':uname'=>$uname));
 				$row=$stmt->fetch(PDO::FETCH_ASSOC);