changed some names

name changes