Replaced username with displayName in various places