Spec changes

Replaced CTypes enum's third element with regex+prefix
Changed things to match spec