Uniqify even more table names