Fixed up naming throughout schema.