New business events - company and trust advice showing as personal

Currently when you enter a new business event for a company or Trust, it pulls through to the personal records for the linked clients (presumably always Directors and Trustees respectively). This is confusing when doing an export or viewing the NBEs.

I would ask that this is changed so that it pulls through to the export as the company/Trust.

This the the new business register from the FCAs perspective and it needs to be at legal entity level only - with no duplication!