Some minor naming and spacing fixes.