New NATO Phonetic Alphabet?

Are there plans for or is there a new or modified NATO phonetic alphabet? I heard "Saber" and "Grid" being used in a context that suggested they were part of the alphabet, but I thought Sierra and Golf were used for those letters.