Changes to clarify some legend names