Fix some more waveform casing