#4 Changed the name of all involved classes.