minor clean up
Change BodyParts withXxx into xxx