fixed more names