Working on properly updating class names when they changed