Updated naming conventions + added opdracht 6