- Changed classe name to fit the nomenclature