i2c fixe-up to deal with a name conflict