Entities updated, naming fixed

[skip ci]
Merge branch 'DBSchema'

[skip ci]