Changed naming convention for foreign keys.