Functions 'wave' and 'sound' renamed.