fix some shapes names