Generalization

Generalized table and field names in Driver