fix some v3 class names