changed some names, minor commit