i2c removed from names where possible (refactoring)