Updated Classes

Changed a few names