fixing more names