Minor adjustments for names