[fix] Reflect new organization changes