Fix name and type and add replaceBit