Restore Backup on Non similar Hardware Issues

[bigops]

I was in the process of upgrading my Firewall from an old hardware with 4 network cards with another hardware with 6 network cards.  From what I have seen is that the backup when restored does not restore the interface configuration and it has to be manually added.  Even when the interfaces are manually added with the same name it was seen that the Firewall rules are now applied to a wrong interface.  It appears that the firewall rules are tagged to the internal WAN / LAN / Opt_x interface names rather than the physical names.  This makes the backup practically useless for a quick restore.  The rules seem to work only when the new interfaces are added sequentially to mimic the old internal interface names.  Is this a bug that can be fixed where the firewall rules can be tied to the given interface names rather than the internal names?