Fix fields names
Update status names