Changed ClefMark to Clef in experimental.

I think this completes the last of the mark renames.