updating type property to most modern syntax, no longer uses integers for wave types