Change shape type labels & structure