Changed file names and controller/action names for new join table. Fixed attributes in index and show pages for new attribute names.