Wozniak types changed to more generic form.