Update model (add fields annotations; change some fields name)
Revert "Update model (add fields annotations; change some fields name)"

This reverts commit 22080364c484c9dea4208a5cd499549f91bcae71.