- rename keys
- improve logging