[tjmc]

Probably the latter in both cases. I'd still use the word kit to denote something that comes disassembled that you need to put together. It's more like when someone describes their new phone as a "nice bit of kit". Ugh!