Rename the tables, so they look nicer