I2C Enumeration - Fix possible?

The enumeration and thus the mapping of I2C devices is confusing. Bus 1 uses /dev/I2c-2 etc. Is there any way to fix this so that the hardware matches the software? Could this be hardcoded in the OS?

The current mapping of devices is most disturbing.

It is fixed in later releases… like jessie.
— Graham