Fix replacing org domain names