Switched to using shortName attribute for generating the heading markup