Minor naming/spacing tweaks.