Normalize names
fix merge conflicts