Fixes #6419 - Change the default org name