singer-songwriter
musician who writes, composes and sings own songs
bard
professional poet in medieval Gaelic and British culture
Grace Melodia
Christian music group in Canada
troubadour
composer and performer of Old Occitan lyric poetry during the High Middle Ages