WIP

* Change `join_table` on matcher to `join_table_name`
* For issue #476