changed some naming conventions