[fix] Reflect the new organisation changes.