Altered contraints to contain 'fk' (foreign key) in the name for similarity.
Merge branch 'rename_fk_constraints' into develop