edit names
fix names