rename Shape to Boundary