- entity names fixes according to comments
- map with string keys is still in engine (prepared to remove)