Changed a few names

Changed a few names