[UPDATE] Added back missing Zephyr terminals