Update to table names to include underscores