changed some class and method namings