Renamed some relations for consistency's sake.