Use new method names from NHI