Which would also bring it into line with the behaviour in the Playlists when you do the same thing.
Just a thought, maybe "Songs - <foldername>" just so there is a clear reminder that you are in the Songs folders and not Playlists (and same change in Playlists, i.e. "Playlists - <foldername>").
Main challenge with my suggestion might be space, especially on smaller screen devices. And yes, I appreciate the contents of the folders look different enough to make the folder context obvious. But just thought I'd toss the idea up in case it was of use.
