With our next release of Open-AudIT (likely 4.3.4) we are further refining how we match devices discovered to devices in the database.
This is an optional configuration option, enabled by setting discovery_use_org_id_match in the global configuration.
When you create a discovery you have an option to devices_assigned_to_org. This means that any devices discovered for this discovery will be assigned (have system.org_id set to) your chosen Organisation.
...
If this change does not work for you, all is not lost. We have added a configuration item (set to y n by default, so it will use not this new option out of the box) called discovery_use_org_id_match. If you change it to n y then the OrgID assigned to the device by the discovery will not be used in the relevant match rules. We would discourage the disabling of this rule and recommend fixing your devices or altering your discoveries instead. Fix your data, not the code 