Fix var names in subspecs ZXTools