made fk names more consistent
more of the same for the database classes