diff --git a/composer.sql b/composer.sql
index e4cc265..14e41f1 100644
--- a/composer.sql
+++ b/composer.sql
@@ -1,4 +1,4 @@
-INSERT INTO composer (id, Vorname, Name, Geburtsdatum, Sterbedatum) 
+INSERT INTO composer (id, first_name, Name, Geburtsdatum, Sterbedatum) 
 VALUES 
     (1, "Johann Sebastian", "Bach", 16850331, 17500728),
     (2, "Ludwig van", "Beethoven", 17701217, 18270326),
@@ -7,7 +7,7 @@ VALUES
     (5, "Robert", "Schumann", 18100608, 18560729)
 ;
 
-INSERT INTO composer (id, Vorname, Name, Geburtsdatum, Sterbedatum) 
+INSERT INTO composer (id, first_name, Name, Geburtsdatum, Sterbedatum) 
 VALUES
     (6, 'Felix', 'Mendelssohn Bartholdy', 18090203, 18471104)
 ;
diff --git a/rep_cli.py b/rep_cli.py
index 6c2017d..a5e34c3 100644
--- a/rep_cli.py
+++ b/rep_cli.py
@@ -13,7 +13,7 @@ class Session:
 
     def get_active_user(self):
         sql_command = f'''
-                      SELECT Vorname, Nachname
+                      SELECT first_name, Nachname
                       FROM Spieler_in
                       WHERE id = {self.user}
                       '''
@@ -46,7 +46,7 @@ class Session:
     
     def create_new_user(self, first_name, name):
         sql_command = f'''
-                      INSERT INTO Spieler_in (Vorname, Nachname)
+                      INSERT INTO Spieler_in (first_name, Nachname)
                       VALUES ("{first_name}", "{name}");
                       '''
         self.db_agent.execute(sql_command)
@@ -92,12 +92,12 @@ class Werk_unter_id:
             self.values[tup[0]] = tup[1]
 
         sql_comp = f"""
-                   SELECT Vorname, Name
+                   SELECT first_name, Name
                    FROM composer
                    WHERE id = {self.values['Komp_id']}
                    """
         werk_comp = self.reader.execute(sql_comp).fetchone()
-        self.values['Vorname'] = werk_comp[0]
+        self.values['first_name'] = werk_comp[0]
         self.values['Name'] = werk_comp[1]
 
         sql_suw = f"""
diff --git a/repertoire.sql b/repertoire.sql
index a3d7578..45213f3 100644
--- a/repertoire.sql
+++ b/repertoire.sql
@@ -1,6 +1,6 @@
 CREATE TABLE composer (
     id INTEGER NOT NULL PRIMARY KEY,
-    Vorname VARCHAR(255) NOT NULL,
+    first_name VARCHAR(255) NOT NULL,
     Name VARCHAR(255) NOT NULL,
     Geburtsdatum DATE NOT NULL,
     Sterbedatum DATE
@@ -34,7 +34,7 @@ CREATE TABLE Satz (
 
 CREATE TABLE Spieler_in (
     id INTEGER NOT NULL PRIMARY KEY,
-    Vorname VARCHAR(255) NOT NULL,
+    first_name VARCHAR(255) NOT NULL,
     Nachname VARCHAR(255) NOT NULL
 );