Changed some names
Changed some names