Change shape naming from Shape[TYPE] to [TYPE]Shape. For example, ShapeBox --> BoxShape.