Minor content changes

(Using smaller names to fit in column sizes on new template)