- names refactored
- id calculation bug fixed