changed names to fit UML