* #39: set proper names for entities and fields;
* better workflow;