changes for display name support