renamed model internal structures names. now it is a litle more legible.