Tweak section names
More fixes