#9: changes to markup class names