Changed naming of foreignkeys