Fix #2020 "Duplicate resource names"

- also fixed a few other resources
- added duplicates check to test