wolfson_sound: changing the names during merge