New names, conflict management

- Adding management of conflicting evos
- Changing name of parameters