Fixed table name collision