need to swap shape names to match integer code