Small changes
Fixed some names