New mapping table name and better relationships
Rename map table