Fiolar, go back to your books. "na Caillí Riabhaí" is correct. The Definite Article in the Genitive Singular Feminine changes from "an" to "na".
As for reading all sorts into this song. It is a children's song and should be treated as such.
Annraoi