Revised DBHelper fields and class names