Plural rename all db tables
Fix report form field name
Update db field names