Adjusted to renamed methods