TWI renamings and minor fixes