renamed methods to comply with coding standards