Changes to Data Model

Vars renamed, one unnecessary relationship removed