Update Class names