Small fixes to improve name standardization