renamed fields for repurposing (issue 2)
resolved some conflicts with schema change
removed unnecessary uniqueness constraint