Corrected type ('wave5' -> 'wave6'); added function that renames and combines data from the two waves.