Merge "Nit: Change name from helper function and macro"