Rename id
Merge pull request #24 from bakura10/id

Use simple id for entities