Changes to avoid infringing on trademarks