Use nameof instead of custom function

Use nameof instead of custom function #7062