Renamed link tables to reduce confusion in automatic Rails scripts.
Also simplified field names in link tables.