Names and methods fixed according to Class Diagram