Small changes
Changing some names