Fixed up naming throughout schema.
Getting the backend working again.