diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Customer.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Customer.java
index 46ae62b3463bf8020d8121c9d8a27ad5bdaec653..b18ed5e1d29a27e16d0539ebbb03ef7d0b682574 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Customer.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Customer.java
@@ -1,48 +1,49 @@
 package com.example.mampfmobil.ui.Classes;
 
-import android.util.Log;
-
 import java.util.ArrayList;
 import java.util.Vector;
 
 public class Customer {
-        public String vorname;
-        public String nachname;
-        public String adresse;
 
-        public Vector<Bestellung> bestellungen;
+        public int id;
+        public String firstName;
+        public String lastName;
+
+        public String address;
 
-        public Vector<ShopItem> favoriten;
+        public Vector<Bestellung> orders;
+
+        public Vector<ShopItem> favorites;
         public Vector<BestellungsTeil> shoppingCart;
 
         public static int idCounter = 1;
-        public int id;
+
 
         public void addBestellung(Bestellung bestellung){
-            if (bestellungen == null) {
-                bestellungen = new Vector<>();
+            if (orders == null) {
+                orders = new Vector<>();
             }
-            bestellungen.add(bestellung);
+            orders.add(bestellung);
         }
 
         public Customer(String vorname,String nachname,String adresse) {
-            this.vorname = vorname;
-            this.nachname = nachname;
-            this.adresse = adresse;
-            favoriten = new Vector<>();
+            this.firstName = vorname;
+            this.lastName = nachname;
+            this.address = adresse;
+            favorites = new Vector<>();
             shoppingCart = new Vector<>();
-            bestellungen = new Vector<>();
+            orders = new Vector<>();
             id = idCounter;
             idCounter++;
         }
 
     public Customer(int id,String vorname,String nachname,String adresse) {
-        this.vorname = vorname;
-        this.nachname = nachname;
-        this.adresse = adresse;
-        favoriten = new Vector<>();
+        this.firstName = vorname;
+        this.lastName = nachname;
+        this.address = adresse;
+        favorites = new Vector<>();
         shoppingCart = new Vector<>();
-        bestellungen = new Vector<>();
+        orders = new Vector<>();
         this.id = id;
     }
 
@@ -62,17 +63,17 @@ public class Customer {
             }
         }
         public void addToFavourits(ShopItem sI){
-            favoriten.add(sI);
+            favorites.add(sI);
         }
         public void removeFromFavourits(ShopItem sI){
 
             ArrayList<ShopItem> itemsToRemove = new ArrayList<>();
 
-            for(ShopItem si: favoriten){
+            for(ShopItem si: favorites){
                 if(si == sI){
                     itemsToRemove.add(si);
                 }
             }
-            favoriten.removeAll(itemsToRemove);
+            favorites.removeAll(itemsToRemove);
         }
 }
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Deliverer.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Deliverer.java
index 74dd0bf73057fe8a9d7cd2a8e8fe3f7f027735f7..1e3fc1b7e0ae9da8f377735a0eae871922ebe921 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Deliverer.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Deliverer.java
@@ -1,12 +1,14 @@
 package com.example.mampfmobil.ui.Classes;
 
 public class Deliverer {
+
+    public int id;
     public String vorname;
     public String nachname;
     public String adresse;
 
     public static int idCounter = 1;
-    public int id;
+
 
 
     public Deliverer(String vorname,String nachname,String adresse) {
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders.java
index 12eb46c0b8c626d6eb6dc322b7d25ba3be3fc36b..d8196d05db5084d419cd4b7595cab7e48075be4e 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Orders.java
@@ -23,7 +23,7 @@ public class Recyclerviewadapter_Orders extends RecyclerView.Adapter<Recyclervie
 
     public Recyclerviewadapter_Orders(Context context){
         this.context =context;
-        this.bestellungen = MampfMobil.currentCustomer.bestellungen;
+        this.bestellungen = MampfMobil.currentCustomer.orders;
     }
     @NonNull
     @Override
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Shop.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Shop.java
index 2892b4dedc5a0fd06df34c44d88cf912762d25b0..440b83cb1c3146f0cd2ece5851e7ca5109d4ef7c 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Shop.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Shop.java
@@ -57,7 +57,7 @@ public class Recyclerviewadapter_Shop extends RecyclerView.Adapter<Recyclerviewa
         holder.tvPrice.setText(String.format("%.2f", shopItemList.get(position).item.price) + " €");
         holder.sI = shopItemList.get(position);
         Vector<ShopItem> favs = new Vector<>();
-        favs = MampfMobil.currentCustomer.favoriten;
+        favs = MampfMobil.currentCustomer.favorites;
 
         holder.favBox.setOnCheckedChangeListener(null);
 
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java
index 34f0acf9dd52d92ef029b607ee87525dbf2959ae..42978a2abcca24f0817a8bda95edbba61222ede0 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_Supplier_Orders.java
@@ -25,28 +25,28 @@ public class Recyclerviewadapter_Supplier_Orders extends RecyclerView.Adapter<Re
     public Recyclerviewadapter_Supplier_Orders(Context context){
         this.context =context;
         for(Customer c:MampfMobil.customers){
-            for(Bestellung b:c.bestellungen){
+            for(Bestellung b:c.orders){
                 if(b.supplier==MampfMobil.currentSupplier&&b.state.equals(context.getString(R.string.ordered))){
                     bestellungen.add(b);
                 }
             }
         }
         for(Customer c:MampfMobil.customers){
-            for(Bestellung b:c.bestellungen){
+            for(Bestellung b:c.orders){
                 if(b.supplier==MampfMobil.currentSupplier&&b.state.equals(context.getString(R.string.ready))){
                     bestellungen.add(b);
                 }
             }
         }
         for(Customer c:MampfMobil.customers){
-            for(Bestellung b:c.bestellungen){
+            for(Bestellung b:c.orders){
                 if(b.supplier==MampfMobil.currentSupplier&&b.state.equals(context.getString(R.string.picked))){
                     bestellungen.add(b);
                 }
             }
         }
         for(Customer c:MampfMobil.customers){
-            for(Bestellung b:c.bestellungen){
+            for(Bestellung b:c.orders){
                 if(b.supplier==MampfMobil.currentSupplier){
                     if(!bestellungen.contains(b)){bestellungen.add(b);}
                 }
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java
index efe46359fa11ecb75e80f6f0c98f137b42b71fef..43f87b4f273776222d5ab9eccdabe380c25ab3db 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_deliverer_orders.java
@@ -8,12 +8,10 @@ import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.example.mampfmobil.R;
 import com.example.mampfmobil.ui.MampfMobil;
-import com.example.mampfmobil.ui.customer.CustomerShoppingCartFragment;
 import com.example.mampfmobil.ui.deliverer.DelivererOpenOrdersFragment;
 
 import java.util.Vector;
@@ -42,7 +40,7 @@ public class Recyclerviewadapter_deliverer_orders extends RecyclerView.Adapter<R
         holder.tvID.setText(String.valueOf("# " + bestellungen.get(position).id));
         holder.tvState.setText(bestellungen.get(position).state);
         holder.supAddress.setText(bestellungen.get(position).supplier.address);
-        holder.cusAddress.setText(bestellungen.get(position).costumer.adresse);
+        holder.cusAddress.setText(bestellungen.get(position).costumer.address);
 
         if(bestellungen.get(position).state.equals(context.getString(R.string.inTransportation))){
             holder.readyButton.setText(context.getString(R.string.delivered));
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_statistic.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_statistic.java
index 90c5dc78cd46df0b790eb9c07a9dc1af4aca68e8..09aaf1239c40203c4d9947cf877f736933d13d7c 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_statistic.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Recyclerviewadapter_statistic.java
@@ -1,7 +1,6 @@
 package com.example.mampfmobil.ui.Classes;
 
 import android.content.Context;
-import android.icu.text.Transliterator;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -28,7 +27,7 @@ public class Recyclerviewadapter_statistic extends RecyclerView.Adapter<Recycler
         this.shopItems = MampfMobil.currentSupplier.shopItems;
         bestellungen = new Vector<>();
         for(Customer c:MampfMobil.customers){
-            for(Bestellung b:c.bestellungen){
+            for(Bestellung b:c.orders){
                 if(b.supplier==MampfMobil.currentSupplier){
                     bestellungen.add(b);
                 }
diff --git a/app/src/main/java/com/example/mampfmobil/ui/Classes/Supplier.java b/app/src/main/java/com/example/mampfmobil/ui/Classes/Supplier.java
index d242464b024b0c17829ac2c8c7b23ba7bdb9e791..0cf6f76fab966810f1853b4b16238d0b7a50cf59 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/Classes/Supplier.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/Classes/Supplier.java
@@ -6,13 +6,15 @@ import java.util.Vector;
 
 public class Supplier {
 
+    public int id;
     public String name;
     public String address;
+    public Vector<ShopItem> shopItems = new Vector<>();
 
     public static int idCounter = 1;
-    public int id;
 
-    public Vector<ShopItem> shopItems = new Vector<>();
+
+
 
     public Supplier(String name,String adresse) {
         shopItems = new Vector<>();
diff --git a/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java b/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java
index 08f6318e47bd5879a8003d588618ee69d67b493f..1c56e8380bdf63b9db6537c07d84df003f91a1b6 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/CustomerActivity.java
@@ -12,11 +12,9 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.navigation.NavController;
 import androidx.navigation.Navigation;
-import androidx.navigation.fragment.NavHostFragment;
 import androidx.navigation.ui.AppBarConfiguration;
 import androidx.navigation.ui.NavigationUI;
 import com.example.mampfmobil.databinding.ActivityCustomerBinding;
-import com.example.mampfmobil.databinding.ActivityDelivererBinding;
 import com.example.mampfmobil.ui.Classes.ShopItem;
 import com.example.mampfmobil.ui.Classes.Supplier;
 
@@ -69,7 +67,7 @@ private ActivityCustomerBinding binding;
     public static void setupShop(){
         shopItemList.clear();
         Vector<Supplier> suppliers = MampfMobil.suppliers;
-        for(ShopItem si:MampfMobil.currentCustomer.favoriten){
+        for(ShopItem si:MampfMobil.currentCustomer.favorites){
             shopItemList.add(si);
         }
 
@@ -86,7 +84,7 @@ private ActivityCustomerBinding binding;
         shopItemList.clear();
         Vector<Supplier> suppliers = MampfMobil.suppliers;
 
-        for(ShopItem si:MampfMobil.currentCustomer.favoriten){
+        for(ShopItem si:MampfMobil.currentCustomer.favorites){
             if(si.item.name.contains(inputString)){
                 shopItemList.add(si);
             }
@@ -107,7 +105,7 @@ private ActivityCustomerBinding binding;
         shopItemList.clear();
         Vector<Supplier> suppliers = MampfMobil.suppliers;
 
-        for(ShopItem si:MampfMobil.currentCustomer.favoriten){
+        for(ShopItem si:MampfMobil.currentCustomer.favorites){
             if(si.item.supplier == supplier){
                 shopItemList.add(si);
             }
@@ -135,7 +133,7 @@ private ActivityCustomerBinding binding;
             ArrayList<ShopItem> rearrangedList = new ArrayList<>();
             for(ShopItem sI : shopItemList){
                 boolean fav = false;
-                for (ShopItem favorit : MampfMobil.currentCustomer.favoriten) {
+                for (ShopItem favorit : MampfMobil.currentCustomer.favorites) {
                     if (sI == favorit) {
                         fav = true;
                         break;  // Exit the inner loop since a match is found
@@ -161,7 +159,7 @@ private ActivityCustomerBinding binding;
             ArrayList<ShopItem> rearrangedList = new ArrayList<>();
             for(ShopItem sI : shopItemList){
                 boolean fav = false;
-                for (ShopItem favorit : MampfMobil.currentCustomer.favoriten) {
+                for (ShopItem favorit : MampfMobil.currentCustomer.favorites) {
                     if (sI == favorit) {
                         fav = true;
                         break;  // Exit the inner loop since a match is found
@@ -188,7 +186,7 @@ private ActivityCustomerBinding binding;
             ArrayList<ShopItem> rearrangedList = new ArrayList<>();
             for(ShopItem sI : shopItemList){
                 boolean fav = false;
-                for (ShopItem favorit : MampfMobil.currentCustomer.favoriten) {
+                for (ShopItem favorit : MampfMobil.currentCustomer.favorites) {
                     if (sI == favorit) {
                         fav = true;
                         break;  // Exit the inner loop since a match is found
diff --git a/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java b/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java
index 3381f2153e237cba99fad56adbcfee43ce4cfb16..503941dedc4a0eac24899fd67d0db0ed5475dd28 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/MampfMobil.java
@@ -17,12 +17,18 @@ import java.util.Vector;
 public class MampfMobil {
 
     public static Vector<Customer> customers;
-    public static Customer currentCustomer;
+
     public static Vector<Deliverer> deliverers;
-    public static Deliverer currentDeliverer;
+
     public static Vector<Supplier> suppliers;
+
+
+
+
     public static Supplier currentSupplier;
 
+    public static Deliverer currentDeliverer;
+    public static Customer currentCustomer;
     static Context context;
 
 
@@ -112,7 +118,7 @@ public class MampfMobil {
 
     public static boolean findCustomer(String vorname, String nachname){
         for(Customer c:customers){
-            if(c.vorname.equals(vorname) && c.nachname.equals(nachname)){
+            if(c.firstName.equals(vorname) && c.lastName.equals(nachname)){
                 MampfMobil.currentCustomer = c;
                 return true;
             }
@@ -122,7 +128,7 @@ public class MampfMobil {
 
     public static boolean createCustomer(String vorname, String nachname,String adresse){
         for(Customer c:customers){
-            if(c.vorname.equals(vorname) && c.nachname.equals(nachname)){
+            if(c.firstName.equals(vorname) && c.lastName.equals(nachname)){
                 return false;
             }
         }
@@ -212,7 +218,7 @@ public class MampfMobil {
         //ID,VORNAME,NACHNAME,ADRESSE
         String csvCustomer = "";
         for(Customer c:MampfMobil.customers){
-            csvCustomer = csvCustomer + c.id +","+ c.vorname +","+ c.nachname +","+ c.adresse + "\n";
+            csvCustomer = csvCustomer + c.id +","+ c.firstName +","+ c.lastName +","+ c.address + "\n";
         }
         String fileName3 = "customer.csv";
         CSVFileHelper.saveCSVFile(context, fileName3, csvCustomer);
@@ -247,7 +253,7 @@ public class MampfMobil {
         // bestellungsteil besteht aus  ITEM-ID1, QUANTITY1, ITEM-ID2, QUANTITY2, ITEM-ID3, QUANTITY3 .... \n
         String csvBestellungen = "";
         for(Customer c:MampfMobil.customers){
-            for(Bestellung b: c.bestellungen){
+            for(Bestellung b: c.orders){
                 csvBestellungen = csvBestellungen + b.id + ","+ b.costumer.id+ "," + b.delivery + "," + b.state + ",";
                 if(b.deliverer == null){
                     csvBestellungen = csvBestellungen + "0,";
@@ -277,7 +283,7 @@ public class MampfMobil {
         //Customer-ID, ShopItem-ID
         String csvFavoriten = "";
         for(Customer c:MampfMobil.customers){
-            for(ShopItem sI: c.favoriten){
+            for(ShopItem sI: c.favorites){
                 csvFavoriten = csvFavoriten + c.id + ","+ sI.id + "\n";
             }
         }
diff --git a/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerShoppingCartFragment.java b/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerShoppingCartFragment.java
index 25bff74626c2931c5facefb80995e98e9cf8b506..ccd29f4a749a33ed76dc40477a36de06797d1296 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerShoppingCartFragment.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/customer/CustomerShoppingCartFragment.java
@@ -2,8 +2,6 @@ package com.example.mampfmobil.ui.customer;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 
 import android.os.Bundle;
@@ -14,7 +12,6 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,9 +23,7 @@ import android.widget.TextView;
 import com.example.mampfmobil.R;
 import com.example.mampfmobil.ui.Classes.Bestellung;
 import com.example.mampfmobil.ui.Classes.BestellungsTeil;
-import com.example.mampfmobil.ui.Classes.Recyclerviewadapter_Shop;
 import com.example.mampfmobil.ui.Classes.Recyclerviewadapter_ShoppingCart;
-import com.example.mampfmobil.ui.CustomerActivity;
 import com.example.mampfmobil.ui.MampfMobil;
 
 public class CustomerShoppingCartFragment extends Fragment {
@@ -47,7 +42,7 @@ public class CustomerShoppingCartFragment extends Fragment {
         View rootView = inflater.inflate(R.layout.fragment_customer_shopping_cart, container, false);
         EditText addressEditText = rootView.findViewById(R.id.editTextAddress);
         sum = rootView.findViewById(R.id.textViewSumComplete);
-        addressEditText.setText(MampfMobil.currentCustomer.adresse);
+        addressEditText.setText(MampfMobil.currentCustomer.address);
         RecyclerView recyclerView = rootView.findViewById(R.id.recyclerViewShoppingCart);
         Button buyButton = rootView.findViewById(R.id.buttonBuyAll);
         Switch switchDelivery = rootView.findViewById(R.id.switchDelivery);
@@ -66,7 +61,7 @@ public class CustomerShoppingCartFragment extends Fragment {
 
                 for(BestellungsTeil bT: MampfMobil.currentCustomer.shoppingCart){
                     boolean exist = false;
-                    for(Bestellung b:MampfMobil.currentCustomer.bestellungen){
+                    for(Bestellung b:MampfMobil.currentCustomer.orders){
                         if(b.supplier == bT.item.supplier && b.state.equals(v.getContext().getString(R.string.ordered)) && !switchDelivery.isChecked() == b.delivery){
                             b.addBestellungsteil(bT);
                             exist = true;
@@ -74,7 +69,7 @@ public class CustomerShoppingCartFragment extends Fragment {
                     }
                     if(!exist){
                         MampfMobil.currentCustomer.addBestellung(new Bestellung(bT.item.supplier,!switchDelivery.isChecked(), rootView.getContext()));
-                        for(Bestellung b:MampfMobil.currentCustomer.bestellungen){
+                        for(Bestellung b:MampfMobil.currentCustomer.orders){
                             if(b.supplier == bT.item.supplier && b.state.equals(v.getContext().getString(R.string.ordered))){
                                 b.addBestellungsteil(bT);
 
diff --git a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererActiveOrdersFragment.java b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererActiveOrdersFragment.java
index dd09ca536e3b7ea602152f634addbd647d182931..8b71948a52e1d52f6b950a06239ffd7e3b17fbf9 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererActiveOrdersFragment.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererActiveOrdersFragment.java
@@ -21,7 +21,6 @@ import com.example.mampfmobil.R;
 import com.example.mampfmobil.ui.Classes.Bestellung;
 import com.example.mampfmobil.ui.Classes.Customer;
 import com.example.mampfmobil.ui.Classes.Recyclerviewadapter_deliverer_activeOrders;
-import com.example.mampfmobil.ui.Classes.Recyclerviewadapter_deliverer_closedOrders;
 import com.example.mampfmobil.ui.MampfMobil;
 
 import java.util.Vector;
@@ -61,7 +60,7 @@ public class DelivererActiveOrdersFragment extends Fragment {
     public static void setVec(Context context){
         activeOrders = new Vector<>();
         for(Customer c: MampfMobil.customers){
-            for(Bestellung b:c.bestellungen){
+            for(Bestellung b:c.orders){
                 if((b.state.equals(context.getString(R.string.readyForTransportDelivererFound)) || b.state.equals(context.getString(R.string.inTransportation))) && b.delivery){
                     activeOrders.add(b);
                 }
diff --git a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererClosedOrdersFragment.java b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererClosedOrdersFragment.java
index 9b9962ca6b722ef87bb423ecee3a7009e7d3aadf..25386224e03b9bb4e4077f0672c0bf5141e7521e 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererClosedOrdersFragment.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererClosedOrdersFragment.java
@@ -62,7 +62,7 @@ public class DelivererClosedOrdersFragment extends Fragment {
     public static void setVec(Context context){
         closedOrders = new Vector<>();
         for(Customer c: MampfMobil.customers){
-            for(Bestellung b:c.bestellungen){
+            for(Bestellung b:c.orders){
                 if(b.state.equals(context.getString(R.string.delivered)) && b.deliverer == MampfMobil.currentDeliverer){
                     closedOrders.add(b);
                 }
diff --git a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererOpenOrdersFragment.java b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererOpenOrdersFragment.java
index 99e9da696f2b93c674307a7be1c3c3c7526bb26c..c9eef92c2af41e40aefe5534582a116c2aefbe1a 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererOpenOrdersFragment.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/deliverer/DelivererOpenOrdersFragment.java
@@ -20,7 +20,6 @@ import android.view.ViewGroup;
 import com.example.mampfmobil.R;
 import com.example.mampfmobil.ui.Classes.Bestellung;
 import com.example.mampfmobil.ui.Classes.Customer;
-import com.example.mampfmobil.ui.Classes.Recyclerviewadapter_Supplier_Orders;
 import com.example.mampfmobil.ui.Classes.Recyclerviewadapter_deliverer_orders;
 import com.example.mampfmobil.ui.MampfMobil;
 
@@ -71,7 +70,7 @@ public class DelivererOpenOrdersFragment extends Fragment {
     public static void setVec(Context context){
         openOrders = new Vector<>();
         for(Customer c: MampfMobil.customers){
-            for(Bestellung b:c.bestellungen){
+            for(Bestellung b:c.orders){
                 if(b.state.equals(context.getString(R.string.readyForTransport)) && b.delivery){
                     openOrders.add(b);
                 }
diff --git a/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierStatisticsFragment.java b/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierStatisticsFragment.java
index 8ba53136b3710fcf5c11b88c0b0f77e691360394..4d596d2109f3c9b14fb37fceed43d87d479e86f4 100644
--- a/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierStatisticsFragment.java
+++ b/app/src/main/java/com/example/mampfmobil/ui/supplier/SupplierStatisticsFragment.java
@@ -1,6 +1,5 @@
 package com.example.mampfmobil.ui.supplier;
 
-import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.ViewModelProvider;
 
@@ -21,7 +20,6 @@ import com.example.mampfmobil.R;
 import com.example.mampfmobil.ui.Classes.Bestellung;
 import com.example.mampfmobil.ui.Classes.BestellungsTeil;
 import com.example.mampfmobil.ui.Classes.Customer;
-import com.example.mampfmobil.ui.Classes.Recyclerviewadapter_Supplier_Orders;
 import com.example.mampfmobil.ui.Classes.Recyclerviewadapter_statistic;
 import com.example.mampfmobil.ui.MampfMobil;
 
@@ -56,7 +54,7 @@ public class SupplierStatisticsFragment extends Fragment {
 
         bestellungen= new Vector<>();
         for(Customer c: MampfMobil.customers){
-            for(Bestellung b:c.bestellungen){
+            for(Bestellung b:c.orders){
                 if(b.supplier==MampfMobil.currentSupplier){
                     bestellungen.add(b);
                 }