processed feedback from E&P
fixed wrongly capitalised ZigBee instances