STYLE: Changed Markups and Annotations names to improve visibility