Rename twi to i2c, which it really is
Clean target as well