replaced bad method names