Use better method names from NHI