Fix fields names
Update status names
Merge branch 'distribution-plugin' into cirandas