Class names change and table name corrected