diff --git a/src/main/java/io/fp/campus/App.java b/src/main/java/io/fp/campus/App.java
index eaad864a966f064c4645c5a5eba6bb27ebe9d3e7..b77d1925c01f2a1ff18feb6cb49a7b3f8ad4fca6 100644
--- a/src/main/java/io/fp/campus/App.java
+++ b/src/main/java/io/fp/campus/App.java
@@ -7,39 +7,39 @@ public class App {
 
     public static void main(String[] args) {
         
-        Faculty inf = new Faculty("INF");
+        Faculty hogwarts = new Faculty("Hogwarts");
 
-        Professor schmolli = new Professor("Schmollinger", 77, "BPM", inf);
-        System.out.println(schmolli.getName());
-        System.out.println("Hält er Vorlesung? "+schmolli.isTalking());
-        schmolli.setTalking(false);
-        System.out.println("Hält er Vorlesung? "+schmolli.isTalking());
+        Professor dumbledore = new Professor("Dumbledore", 77, "BPM", hogwarts);
+        System.out.println(dumbledore.getName());
+        System.out.println("Hält er Vorlesung? "+dumbledore.isTalking());
+        dumbledore.setTalking(false);
+        System.out.println("Hält er Vorlesung? "+dumbledore.isTalking());
 
-        Assistent kevin = new Assistent("Jovanovic", 26, inf);
-        kevin.setBoss(schmolli);
-        System.out.println(kevin.getName());
-        System.out.println(kevin.getBoss().getName());
+        Assistent hagrid = new Assistent("Hagrid", 26, hogwarts);
+        hagrid.setBoss(dumbledore);
+        System.out.println(hagrid.getName());
+        System.out.println(hagrid.getBoss().getName());
 
-        Assistent juergen = new Assistent("Krauß", 30, inf);
-        juergen.setBoss(schmolli);
+        Assistent dobby = new Assistent("Dobby", 130, hogwarts);
+        dobby.setBoss(dumbledore);
 
-        Assistent backe = new Assistent("Backe", 50, inf);
+        Assistent pince = new Assistent("Madam Pince", 50, hogwarts);
         
-        inf.addProfessor(schmolli);
-        inf.addAssistent(kevin);
-        inf.addAssistent(juergen);
-        inf.addAssistent(backe);
+        hogwarts.addProfessor(dumbledore);
+        hogwarts.addAssistent(hagrid);
+        hogwarts.addAssistent(dobby);
+        hogwarts.addAssistent(pince);
 
-        System.out.println("Fakultät "+ inf.getName());
-        System.out.println(inf.getProfs().toString());
-        System.out.println(inf.getAssis().toString());
+        System.out.println("Fakultät "+ hogwarts.getName());
+        System.out.println(hogwarts.getProfs().toString());
+        System.out.println(hogwarts.getAssis().toString());
 
-        System.out.println(inf.getAssisOfProf(schmolli));
+        System.out.println(hogwarts.getAssisOfProf(dumbledore));
 
-        System.out.println(inf.getProfsWithAssis());
+        System.out.println(hogwarts.getProfsWithAssis());
 
-        System.out.println("Anzahl Profs: " + inf.getAmountProfs());
+        System.out.println("Anzahl Profs: " + hogwarts.getAmountProfs());
 
-        System.out.println("Anzahl Assis: " + inf.getAmountAssis());
+        System.out.println("Anzahl Assis: " + hogwarts.getAmountAssis());
     }
 }
diff --git a/src/test/java/io/fp/campus/FacultyTest.java b/src/test/java/io/fp/campus/FacultyTest.java
index f1880d03c3fce6d7a1eade512be4e98dd356bc07..c0c664974d34ec7710a72413adcb80f85a4b6f86 100644
--- a/src/test/java/io/fp/campus/FacultyTest.java
+++ b/src/test/java/io/fp/campus/FacultyTest.java
@@ -8,31 +8,31 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class FacultyTest {
 
-    Faculty inf;
+    Faculty hogwarts;
 
     @BeforeEach
     void setUp() {
-        inf = new Faculty("INF");
-        Professor schmolli = new Professor("Schmollinger", 77, "BPM", inf);
-        schmolli.setTalking(false);
+        hogwarts = new Faculty("Hogwarts");
+        Professor dumbledore = new Professor("Dumbledore", 77, "BPM", hogwarts);
+        dumbledore.setTalking(false);
         
-        Assistent kevin = new Assistent("Jovanovic", 26, inf);
-        kevin.setBoss(schmolli);
+        Assistent hagrid = new Assistent("Hagrid", 26, hogwarts);
+        hagrid.setBoss(dumbledore);
 
-        Assistent juergen = new Assistent("Krauß", 30, inf);
-        juergen.setBoss(schmolli);
+        Assistent dobby = new Assistent("Dobby", 130, hogwarts);
+        dobby.setBoss(dumbledore);
 
-        Assistent backe = new Assistent("Backe", 50, inf);
+        Assistent pince = new Assistent("Madam Pince", 40, hogwarts);
         
-        inf.addProfessor(schmolli);
-        inf.addAssistent(kevin);
-        inf.addAssistent(juergen);
-        inf.addAssistent(backe);
+        hogwarts.addProfessor(dumbledore);
+        hogwarts.addAssistent(hagrid);
+        hogwarts.addAssistent(dobby);
+        hogwarts.addAssistent(pince);
     }
     @Test
     void testGetProfsWithAssis() {
-        ArrayList<Professor> profs = inf.getProfs();
-        ArrayList<Professor> profsWithAssis = inf.getProfsWithAssis();
+        ArrayList<Professor> profs = hogwarts.getProfs();
+        ArrayList<Professor> profsWithAssis = hogwarts.getProfsWithAssis();
         assertEquals(profs, profsWithAssis);
     }
 }
\ No newline at end of file