Rename Shape#shape to Shape#type.