Add "TONE_" prefix to tone names
Make VOWELS local