Clean up names in markup