I have set naming policies as well to identify Teams by sub-org and business unit and done the same as you have with DLs and SGs. Fixing the display names was easy, the challenge is the email address. I will have to use the script that you referenced.