Tweaked a couple of C4Shape properties so that they're named properly