removed the word "Ribbon" from class-names