Fixes #4373 - match renamed methods in core