fixed composite shape names