fixed naming issue and updating of composite shape points