fixed piece class names