Fix db table name convention with underscores