Hopefully the last instance of renaming organization