Added hasDisplayName checks for environment suit